From 670c56e521e3f59be7722f1243399d8289e14626 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Nov 2005 16:19:07 +0000 Subject: * merged the NMU from Franz Pop, fixed armeb problem (#333599) --- buildlib/archtable | 2 +- buildlib/sizetable | 1 + configure.in | 2 +- debian/changelog | 11 ++++++++++- share/debian-archive.gpg | Bin 1303 -> 2717 bytes 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/buildlib/archtable b/buildlib/archtable index af1123d02..197529202 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -11,7 +11,7 @@ sparc sparc sparc64 sparc alpha.* alpha m68k m68k -armeb.* armeb +arm.*b armeb arm.* arm powerpc powerpc ppc powerpc diff --git a/buildlib/sizetable b/buildlib/sizetable index 51a136d4a..cf6a3ae2d 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -11,6 +11,7 @@ # The format is:- # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 +armeb big 1 4 2 4 arm little 1 4 2 4 armeb big 1 4 2 4 alpha little 1 4 2 8 diff --git a/configure.in b/configure.in index 758727f2f..cae1ffe6a 100644 --- a/configure.in +++ b/configure.in @@ -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) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.42.1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.42.2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index a8c9e398b..acacb8f23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.42.2) unstable; urgency=low +apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) @@ -16,6 +16,15 @@ apt (0.6.42.2) unstable; urgency=low -- +apt (0.6.42.2) unstable; urgency=high + + * NMU (approved by maintainer) + * Add AMD64 archive signing key to debian-archive.gpg (closes: #336500). + * Add big-endian arm (armeb) support (closes: #333599). + * Priority high to get the AMD key into testing ASAP. + + -- Frans Pop Sun, 30 Oct 2005 21:29:11 +0100 + apt (0.6.42.1) unstable; urgency=low * fix a incorrect example in the apt_prefrences man page diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg index c391d8fa1..bb5ed5033 100644 Binary files a/share/debian-archive.gpg and b/share/debian-archive.gpg differ -- cgit v1.2.3 From 19326d244793da9135d3ef0d026b5c29a82fc27a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Nov 2005 16:27:58 +0000 Subject: * removed double armeb entry in buildlib/sizetable --- buildlib/sizetable | 1 - configure.in | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/buildlib/sizetable b/buildlib/sizetable index cf6a3ae2d..8b18528cf 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -13,7 +13,6 @@ i386 little 1 4 2 4 armeb big 1 4 2 4 arm little 1 4 2 4 -armeb big 1 4 2 4 alpha little 1 4 2 8 mipsel little 1 4 2 4 sparc big 1 4 2 4 diff --git a/configure.in b/configure.in index cae1ffe6a..6130ab544 100644 --- a/configure.in +++ b/configure.in @@ -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) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.42.2") +AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) -- cgit v1.2.3 From 025b8a36fa50680dd1549426c5906363ddaebd02 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Nov 2005 04:52:57 +0000 Subject: * finalized changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index acacb8f23..0b0343d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ apt (0.6.42.3) unstable; urgency=low - bufix in FindSrc (closes: #335213) * added armeb to archtable (closes: #333599) - -- + -- Michael Vogt Wed, 9 Nov 2005 05:52:31 +0100 apt (0.6.42.2) unstable; urgency=high -- cgit v1.2.3 From a3371852091e3590bd425f2674b56ae3d5ae2445 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Nov 2005 19:46:44 +0000 Subject: * turn off "secure-acquire" when --allow-unauthenticated is given --- apt-pkg/acquire-item.cc | 6 ++++++ debian/changelog | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index dea68f3ee..debd1face 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -770,6 +770,12 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, } } + // "allow-unauthenticated" restores apts old fetching behaviour + // that means that e.g. unauthenticated file:// uris are higher + // priority than authenticated http:// uris + if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) + Trusted = false; + // Select a source if (QueueNext() == false && _error->PendingError() == false) _error->Error(_("I wasn't able to locate file for the %s package. " diff --git a/debian/changelog b/debian/changelog index 0b0343d9c..9e9b46ab9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,10 +11,12 @@ apt (0.6.42.3) unstable; urgency=low - patch-128: Danish translation update (closes: #337949) - patch-129: Basque translation update (closes: #338101) * cmdline/apt-get.cc: - - bufix in FindSrc (closes: #335213) + - bufix in FindSrc (closes: #335213, #337910) * added armeb to archtable (closes: #333599) + * with --allow-unauthenticated use the old fallback behaviour for + sources (closes: #335112) - -- Michael Vogt Wed, 9 Nov 2005 05:52:31 +0100 + -- Michael Vogt Wed, 9 Nov 2005 07:22:31 +0100 apt (0.6.42.2) unstable; urgency=high -- cgit v1.2.3 From 34b53501a98d05ac161b1d29b4325587b73de402 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Nov 2005 13:06:15 +0000 Subject: * merged the sources.list.d patch Patches applied: * apt@packages.debian.org/apt--sources-list-d--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-30 * apt@packages.debian.org/apt--sources-list-d--0--patch-1 Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d --- apt-pkg/init.cc | 5 ++- apt-pkg/sourcelist.cc | 115 +++++++++++++++++++++++++++++++++++++++++++++++--- apt-pkg/sourcelist.h | 5 +++ 3 files changed, 118 insertions(+), 7 deletions(-) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index f4b816c0b..b47378d4a 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: init.cc,v 1.21 2004/02/27 00:46:44 mdz Exp $ +// $Id: init.cc,v 1.20 2003/02/09 20:31:05 doogie Exp $ /* ###################################################################### Init - Initialize the package library @@ -64,13 +64,14 @@ bool pkgInitConfig(Configuration &Cnf) // Configuration Cnf.Set("Dir::Etc","etc/apt/"); Cnf.Set("Dir::Etc::sourcelist","sources.list"); + Cnf.Set("Dir::Etc::sourceparts","sources.list.d"); Cnf.Set("Dir::Etc::vendorlist","vendors.list"); Cnf.Set("Dir::Etc::vendorparts","vendors.list.d"); Cnf.Set("Dir::Etc::main","apt.conf"); Cnf.Set("Dir::Etc::parts","apt.conf.d"); Cnf.Set("Dir::Etc::preferences","preferences"); Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); - + bool Res = true; // Read an alternate config file diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 95aba0cb5..db895a6c1 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sourcelist.cc,v 1.25 2004/06/07 23:08:00 mdz Exp $ +// $Id: sourcelist.cc,v 1.3 2002/08/15 20:51:37 niemeyer Exp $ /* ###################################################################### List of Sources @@ -21,6 +21,13 @@ #include #include + +// CNC:2003-03-03 - This is needed for ReadDir stuff. +#include +#include +#include +#include +#include /*}}}*/ using namespace std; @@ -142,23 +149,66 @@ pkgSourceList::~pkgSourceList() /* */ bool pkgSourceList::ReadMainList() { - return Read(_config->FindFile("Dir::Etc::sourcelist")); + // CNC:2003-03-03 - Multiple sources list support. + bool Res = true; +#if 0 + Res = ReadVendors(); + if (Res == false) + return false; +#endif + + Reset(); + // CNC:2003-11-28 - Entries in sources.list have priority over + // entries in sources.list.d. + string Main = _config->FindFile("Dir::Etc::sourcelist"); + if (FileExists(Main) == true) + Res &= ReadAppend(Main); + + string Parts = _config->FindDir("Dir::Etc::sourceparts"); + if (FileExists(Parts) == true) + Res &= ReadSourceDir(Parts); + + return Res; } /*}}}*/ +// CNC:2003-03-03 - Needed to preserve backwards compatibility. +// SourceList::Reset - Clear the sourcelist contents /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgSourceList::Reset() +{ + for (const_iterator I = SrcList.begin(); I != SrcList.end(); I++) + delete *I; + SrcList.erase(SrcList.begin(),SrcList.end()); +} + /*}}}*/ +// CNC:2003-03-03 - Function moved to ReadAppend() and Reset(). // SourceList::Read - Parse the sourcelist file /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgSourceList::Read(string File) +{ + Reset(); + return ReadAppend(File); +} + /*}}}*/ +// SourceList::ReadAppend - Parse a sourcelist file /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ReadAppend(string File) { // 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()); - char Buffer[300]; +#endif + // CNC:2003-12-10 - 300 is too short. + char Buffer[1024]; int CurLine = 0; while (F.eof() == false) @@ -172,7 +222,10 @@ bool pkgSourceList::Read(string File) char *I; - for (I = Buffer; *I != 0 && *I != '#'; I++); + // CNC:2003-02-20 - Do not break if '#' is inside []. + for (I = Buffer; *I != 0 && *I != '#'; I++) + if (*I == '[') + for (I++; *I != 0 && *I != ']'; I++); *I = 0; const char *C = _strstrip(Buffer); @@ -188,7 +241,7 @@ bool pkgSourceList::Read(string File) Type *Parse = Type::GetType(LineType.c_str()); if (Parse == 0) - return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str()); + return _error->Error(_("Type '%s' is not known in on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str()); // Vendor name specified if (C[0] == '[') @@ -259,3 +312,55 @@ bool pkgSourceList::GetIndexes(pkgAcquire *Owner, bool GetAll) const return true; } /*}}}*/ +// CNC:2003-03-03 - By Anton V. Denisov . +// SourceList::ReadSourceDir - Read a directory with sources files +// Based on ReadConfigDir() /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgSourceList::ReadSourceDir(string Dir) +{ + DIR *D = opendir(Dir.c_str()); + if (D == 0) + return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); + + vector List; + + for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) + { + if (Ent->d_name[0] == '.') + continue; + + // CNC:2003-12-02 Only accept .list files as valid sourceparts + if (flExtension(Ent->d_name) != "list") + continue; + + // Skip bad file names ala run-parts + const char *C = Ent->d_name; + for (; *C != 0; C++) + if (isalpha(*C) == 0 && isdigit(*C) == 0 + && *C != '_' && *C != '-' && *C != '.') + break; + if (*C != 0) + continue; + + // Make sure it is a file and not something else + string File = flCombine(Dir,Ent->d_name); + struct stat St; + if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) + continue; + + List.push_back(File); + } + closedir(D); + + sort(List.begin(),List.end()); + + // Read the files + for (vector::const_iterator I = List.begin(); I != List.end(); I++) + if (ReadAppend(*I) == false) + return false; + return true; + +} + /*}}}*/ + diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 5d8427017..123ae6984 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -77,6 +77,11 @@ class pkgSourceList bool ReadMainList(); bool Read(string File); + + // CNC:2003-03-03 + void Reset(); + bool ReadAppend(string File); + bool ReadSourceDir(string Dir); // List accessors inline const_iterator begin() const {return SrcList.begin();}; -- cgit v1.2.3 From 4d0b46ea2c7482a8f540d8a1326eacad20e7f593 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Nov 2005 13:59:52 +0000 Subject: * changelog update --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0e3381c43..2a636ae30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.6.42.4) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: * zh_CN.po: Completed to 507 strings(Closes: #338267) * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) -- -- cgit v1.2.3 From 7e15443375875a15babd8bc35eeaef2785a06374 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Nov 2005 15:30:36 +0000 Subject: * sources.list.d documented --- doc/sources.list.5.xml | 7 + po/eu.po | 49 ++++-- po/fr.po | 76 +++++---- po/sv.po | 414 ++++++++++++++++++++++--------------------------- po/tl.po | 39 +++-- 5 files changed, 303 insertions(+), 282 deletions(-) diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index bde9893bf..9762005b0 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -46,6 +46,13 @@ by using a #. + sources.list.d + The /etc/apt/sources.list.d directory provides + a way to add sources.list entries in seperate files that end with + .list. The format is the same as for the regular + sources.list file. + + The deb and deb-src types The deb type describes a typical two-level Debian archive, distribution/component. Typically, diff --git a/po/eu.po b/po/eu.po index e480d15a1..7310e029d 100644 --- a/po/eu.po +++ b/po/eu.po @@ -233,7 +233,8 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan" +msgstr "" +"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" @@ -1107,7 +1108,8 @@ msgstr "Huts egin du zenbat artxibo lortzean." #: cmdline/apt-get.cc:2034 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" +msgstr "" +"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" #: cmdline/apt-get.cc:2046 #, c-format @@ -1130,7 +1132,8 @@ msgstr "Prozesu umeak huts egin du" #: cmdline/apt-get.cc:2099 msgid "Must specify at least one package to check builddeps for" -msgstr "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko" +msgstr "" +"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko" #: cmdline/apt-get.cc:2127 #, c-format @@ -1147,7 +1150,8 @@ msgstr "%s: ez du eraikitze-mendekotasunik.\n" msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -msgstr "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" +msgstr "" +"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" #: cmdline/apt-get.cc:2251 #, c-format @@ -1350,7 +1354,8 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen" #: dselect/install:103 -msgid "above this message are important. Please fix them and run [I]nstall again" +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" "aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall " "berriro" @@ -1609,7 +1614,8 @@ msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du" +msgstr "" +"Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1648,7 +1654,8 @@ msgstr "CD okerra" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da." +msgstr "" +"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da." #: methods/cdrom.cc:169 msgid "Disk not found." @@ -1749,7 +1756,8 @@ msgstr "Ezin izan da socket-a sortu" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du" +msgstr "" +"Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1843,7 +1851,8 @@ msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du" +msgstr "" +"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du" #: methods/connect.cc:106 #, c-format @@ -1882,7 +1891,8 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten." #: methods/gpgv.cc:191 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +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:196 @@ -2100,7 +2110,8 @@ msgstr "%s aukerak argumentu bat behar du." #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "%s aukera: konfigurazio-elementuaren zehaztapenak = eduki behar du." +msgstr "" +"%s aukera: konfigurazio-elementuaren zehaztapenak = eduki behar du." #: apt-pkg/contrib/cmndline.cc:237 #, c-format @@ -2151,7 +2162,8 @@ msgstr "Ezin izan da %s blokeo-fitxategia ireki" #: apt-pkg/contrib/fileutl.cc:105 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat" +msgstr "" +"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat" #: apt-pkg/contrib/fileutl.cc:109 #, c-format @@ -2365,8 +2377,10 @@ msgstr "'%s' motako indize-fitxategirik ez da onartzen" #: apt-pkg/algorithms.cc:241 #, 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." +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:1059 msgid "" @@ -2557,7 +2571,8 @@ msgstr "" #: apt-pkg/acquire-item.cc:811 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." @@ -2663,7 +2678,8 @@ msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" +msgstr "" +"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" #: apt-pkg/deb/dpkgpm.cc:358 #, c-format @@ -2718,4 +2734,3 @@ msgstr "%s konfigurazioaz kentzen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" - diff --git a/po/fr.po b/po/fr.po index 7c2773cac..f14a10b96 100644 --- a/po/fr.po +++ b/po/fr.po @@ -235,11 +235,13 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" +msgstr "" +"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" #: cmdline/apt-cdrom.cc:93 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" +msgstr "" +"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@ -315,7 +317,8 @@ msgstr "Impossible d' #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" +msgstr "" +"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" @@ -431,7 +434,8 @@ msgstr "Aucune s #: ftparchive/apt-ftparchive.cc:835 #, 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 »" +msgstr "" +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" #: ftparchive/cachedb.cc:45 #, c-format @@ -797,7 +801,8 @@ msgstr "Erreur interne, #: cmdline/apt-get.cc:762 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." +msgstr "" +"Les paquets doivent être enlevés mais la désinstallation est désactivée." #: cmdline/apt-get.cc:773 msgid "Internal error, Ordering didn't finish" @@ -831,7 +836,8 @@ msgstr "Il est n #: cmdline/apt-get.cc:827 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n" +msgstr "" +"Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n" #: cmdline/apt-get.cc:830 #, c-format @@ -902,7 +908,8 @@ msgstr "" #: cmdline/apt-get.cc:988 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." +msgstr "" +"l'option --fix-missing et l'échange de support ne sont pas encore reconnus." #: cmdline/apt-get.cc:993 msgid "Unable to correct missing packages." @@ -964,7 +971,8 @@ msgstr "Aucun paquet ne correspond au paquet %s" #: cmdline/apt-get.cc:1131 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" +msgstr "" +"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" #: cmdline/apt-get.cc:1139 #, c-format @@ -1018,7 +1026,8 @@ msgstr "Note, s #: cmdline/apt-get.cc:1557 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 :" +msgstr "" +"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" #: cmdline/apt-get.cc:1560 msgid "" @@ -1193,7 +1202,8 @@ msgstr "Impossible de satisfaire les d #: cmdline/apt-get.cc:2325 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +msgstr "" +"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." #: cmdline/apt-get.cc:2329 msgid "Failed to process build dependencies" @@ -1376,7 +1386,8 @@ msgstr "" "seules les erreurs" #: dselect/install:103 -msgid "above this message are important. Please fix them and run [I]nstall again" +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" "précédant ce message sont importantes. Veuillez les corriger et\n" "démarrer l'[I]nstallation une nouvelle fois." @@ -1637,7 +1648,8 @@ msgstr "Ce n'est pas une archive DEB valide, partie #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" +msgstr "" +"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1740,7 +1752,8 @@ msgstr "" #: methods/ftp.cc:265 #, 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" +msgstr "" +"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" #: methods/ftp.cc:291 #, c-format @@ -1777,7 +1790,8 @@ msgstr "Impossible de cr #: methods/ftp.cc:698 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é" +msgstr "" +"Impossible de se connecter sur le port de données, délai de connexion dépassé" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1909,10 +1923,12 @@ msgstr "Impossible de se connecter #: methods/gpgv.cc:92 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." +msgstr "" +"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." #: methods/gpgv.cc:191 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +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é." @@ -2346,12 +2362,14 @@ msgstr "Ligne %lu mal form #: apt-pkg/sourcelist.cc:98 #, 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)" +msgstr "" +"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" #: apt-pkg/sourcelist.cc:105 #, 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)" +msgstr "" +"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" #: apt-pkg/sourcelist.cc:156 #, c-format @@ -2371,12 +2389,14 @@ msgstr "Ligne %u mal form #: apt-pkg/sourcelist.cc:191 #, 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" +msgstr "" +"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s" #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" +msgstr "" +"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" #: apt-pkg/packagemanager.cc:402 #, c-format @@ -2397,7 +2417,8 @@ msgstr "Le type de fichier d'index #: apt-pkg/algorithms.cc:241 #, c-format -msgid "The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son " "archive." @@ -2464,7 +2485,8 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list" +msgstr "" +"Vous devez insérer quelques adresses « sources » dans votre sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." @@ -2538,7 +2560,8 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Vous avez dépassé le nombre de versions que cet APT est capable de traiter." +msgstr "" +"Vous avez dépassé le nombre de versions que cet APT est capable de traiter." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." @@ -2574,7 +2597,8 @@ msgstr "Assemblage des fichiers list #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" -msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "" +"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" #: apt-pkg/acquire-item.cc:126 #, c-format @@ -2606,7 +2630,8 @@ msgstr "" #: apt-pkg/acquire-item.cc:811 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." @@ -2769,4 +2794,3 @@ msgstr "%s purg #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" - diff --git a/po/sv.po b/po/sv.po index 8536c835b..b93c051fe 100644 --- a/po/sv.po +++ b/po/sv.po @@ -19,12 +19,8 @@ msgstr "" msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s version %s har ett beroende som inte kan tillfredsställas:\n" -#: cmdline/apt-cache.cc:175 -#: cmdline/apt-cache.cc:527 -#: cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 -#: cmdline/apt-cache.cc:989 -#: cmdline/apt-cache.cc:1357 +#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 +#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" @@ -86,8 +82,7 @@ msgstr "Totalt bortkastat utrymme: " msgid "Total space accounted for: " msgstr "Totalt utrymme som kan redogöras för: " -#: cmdline/apt-cache.cc:446 -#: cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "Paketfilen %s är ur synk." @@ -104,8 +99,7 @@ msgstr "Inga paket funna" msgid "Package files:" msgstr "\"Package\"-filer:" -#: cmdline/apt-cache.cc:1469 -#: cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cachen är ur synk, kan inte korsreferera en paketfil" @@ -120,8 +114,7 @@ msgstr "%4i %s\n" msgid "Pinned packages:" msgstr "Fastnålade paket:" -#: cmdline/apt-cache.cc:1494 -#: cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "(ej funnen)" @@ -130,8 +123,7 @@ msgstr "(ej funnen)" msgid " Installed: " msgstr " Installerad: " -#: cmdline/apt-cache.cc:1517 -#: cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "(ingen)" @@ -154,13 +146,9 @@ msgstr " Versionstabell:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1651 -#: cmdline/apt-cdrom.cc:138 -#: cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 -#: ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 -#: cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 +#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s för %s %s kompilerad den %s %s\n" @@ -312,8 +300,7 @@ msgstr "" " -c=? Läs denna inställningsfil.\n" " -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 -#: apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -322,17 +309,13 @@ msgstr "Kunde inte skriva till %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan inte ta reda på debconfs version. Är debconf installerat?" -#: ftparchive/apt-ftparchive.cc:167 -#: ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Listan över filtillägg för Packages är för lång" -#: ftparchive/apt-ftparchive.cc:169 -#: ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 -#: ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 -#: ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 +#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 +#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "Fel vid behandling av katalogen %s" @@ -491,8 +474,7 @@ msgstr "V: " msgid "E: Errors apply to file " msgstr "F: Felen gäller filen " -#: ftparchive/writer.cc:151 -#: ftparchive/writer.cc:181 +#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Misslyckades att slå upp %s" @@ -532,12 +514,8 @@ msgstr "*** Misslyckades att l msgid " DeLink limit of %sB hit.\n" msgstr " Avlänkningsgräns på %sB nådd.\n" -#: ftparchive/writer.cc:358 -#: apt-inst/extract.cc:181 -#: apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 -#: apt-inst/deb/dpkgdb.cc:121 -#: methods/gpgv.cc:256 +#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256 #, c-format msgid "Failed to stat %s" msgstr "Misslyckades att ta status på %s" @@ -547,15 +525,13 @@ msgstr "Misslyckades att ta status p msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:394 -#: ftparchive/writer.cc:603 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, 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:437 -#: ftparchive/writer.cc:689 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för %s är %s ej %s\n" @@ -565,38 +541,32 @@ msgstr " ansvarig f msgid "Internal error, could not locate member %s" msgstr "Internt fel, kunde inta hitta delen %s" -#: ftparchive/contents.cc:353 -#: ftparchive/contents.cc:384 +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "realloc - Misslyckades att allokera minne" -#: ftparchive/override.cc:38 -#: ftparchive/override.cc:146 +#: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format msgid "Unable to open %s" msgstr "Kunde inte öppna %s" # parametrar: filnamn, radnummer -#: ftparchive/override.cc:64 -#: ftparchive/override.cc:170 +#: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Felaktig override %s rad %lu #1" -#: ftparchive/override.cc:78 -#: ftparchive/override.cc:182 +#: ftparchive/override.cc:78 ftparchive/override.cc:182 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Felaktig override %s rad %lu #2" -#: ftparchive/override.cc:92 -#: ftparchive/override.cc:195 +#: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/override.cc:131 -#: ftparchive/override.cc:205 +#: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" msgstr "Misslyckades att läsa override-filen %s" @@ -612,8 +582,7 @@ msgstr "Ok msgid "Compressed output %s needs a compression set" msgstr "Komprimerad utdata %s behöver en komprimeringsuppsättning" -#: ftparchive/multicompress.cc:172 -#: methods/rsh.cc:91 +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades att skapa IPC-rör till underprocess" @@ -659,8 +628,7 @@ msgstr "Misslyckades att l msgid "Problem unlinking %s" msgstr "Problem med att länka ut %s" -#: ftparchive/multicompress.cc:490 -#: apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades att byta namn på %s till %s" @@ -669,8 +637,7 @@ msgstr "Misslyckades att byta namn p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 -#: cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljärt uttryck - %s" @@ -815,8 +782,7 @@ msgstr "Installera dessa paket utan verifiering [j/N]? " msgid "Some packages could not be authenticated" msgstr "Några av paketen kunde inte autentiseras" -#: cmdline/apt-get.cc:709 -#: cmdline/apt-get.cc:856 +#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppstått och -y användes utan --force-yes" @@ -832,22 +798,20 @@ msgstr "Paket m msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" -#: cmdline/apt-get.cc:789 -#: cmdline/apt-get.cc:1811 -#: cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen." -#: cmdline/apt-get.cc:799 -#: cmdline/apt-get.cc:1892 -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." #: cmdline/apt-get.cc:814 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian.org" +msgstr "" +"Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian." +"org" #: cmdline/apt-get.cc:819 #, c-format @@ -869,8 +833,7 @@ msgstr "Efter uppackning kommer %sB ytterligare diskutrymme anv msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigöras på disken.\n" -#: cmdline/apt-get.cc:844 -#: cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte läsa av ledigt utrymme i %s" @@ -880,8 +843,7 @@ msgstr "Kunde inte l msgid "You don't have enough free space in %s." msgstr "Du har inte tillräckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:862 -#: cmdline/apt-get.cc:882 +#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." @@ -901,8 +863,7 @@ msgstr "" " ?] " # Visas då man svarar nej -#: cmdline/apt-get.cc:872 -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891 msgid "Abort." msgstr "Avbryter." @@ -910,9 +871,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:959 -#: cmdline/apt-get.cc:1367 -#: cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades att hämta %s %s\n" @@ -921,14 +880,17 @@ msgstr "Misslyckades att h msgid "Some files failed to download" msgstr "Misslyckades att hämta vissa filer" -#: cmdline/apt-get.cc:978 -#: cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" #: cmdline/apt-get.cc:984 -msgid "Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?" -msgstr "Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med --fix-missing." +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med " +"--fix-missing." #: cmdline/apt-get.cc:988 msgid "--fix-missing and media swapping is not currently supported" @@ -950,7 +912,8 @@ msgstr "Observera, v #: cmdline/apt-get.cc:1038 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" +msgstr "" +"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" #: cmdline/apt-get.cc:1056 #, c-format @@ -1019,21 +982,23 @@ msgstr "Vald version %s (%s) f msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1328 -#: cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 msgid "Unable to lock the list directory" msgstr "Kunde inte låsa listkatalogen" #: cmdline/apt-get.cc:1386 -msgid "Some index files failed to download, they have been ignored, or old ones used instead." -msgstr "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla använts istället." +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " +"använts istället." #: cmdline/apt-get.cc:1405 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: cmdline/apt-get.cc:1504 -#: cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" @@ -1048,8 +1013,12 @@ msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan möjligen rätta detta genom att köra \"apt-get -f install\":" #: cmdline/apt-get.cc:1560 -msgid "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)." -msgstr "Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket (eller ange en lösning)." +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket " +"(eller ange en lösning)." #: cmdline/apt-get.cc:1572 msgid "" @@ -1097,9 +1066,7 @@ msgstr "Rekommenderade paket:" msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:1709 -#: methods/ftp.cc:702 -#: methods/connect.cc:101 +#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Misslyckades" @@ -1107,8 +1074,7 @@ msgstr "Misslyckades" msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:1779 -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren bröt sönder saker" @@ -1116,8 +1082,7 @@ msgstr "Internt fel, probleml msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange åtminstone ett paket att hämta källkod för" -#: cmdline/apt-get.cc:1914 -#: cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" @@ -1186,18 +1151,27 @@ msgstr "%s har inga byggberoenden.\n" #: cmdline/apt-get.cc:2199 #, c-format -msgid "%s dependency for %s cannot be satisfied because the package %s cannot be found" -msgstr "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" #: cmdline/apt-get.cc:2251 #, c-format -msgid "%s dependency for %s cannot be satisfied because no available versions of package %s can satisfy version requirements" -msgstr "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga versioner av paketet %s uppfyller versionskraven" +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +msgstr "" +"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " +"versioner av paketet %s uppfyller versionskraven" #: cmdline/apt-get.cc:2286 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s är för nytt" +msgstr "" +"Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s " +"är för nytt" #: cmdline/apt-get.cc:2311 #, c-format @@ -1370,12 +1344,8 @@ msgstr "" msgid "Bad default setting!" msgstr "Ogiltig standardinställning!" -#: dselect/install:51 -#: dselect/install:83 -#: dselect/install:87 -#: dselect/install:93 -#: dselect/install:104 -#: dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 msgid "Press enter to continue." msgstr "Tryck Enter för att fortsätta." @@ -1395,7 +1365,8 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "saknade beroenden. Detta är okej, bara felen ovanför detta" #: dselect/install:103 -msgid "above this message are important. Please fix them and run [I]nstall again" +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "meddelande är viktiga. Försök rätta dem och [I]nstallera igen" #: dselect/update:30 @@ -1410,8 +1381,7 @@ msgstr "Misslyckades att skapa r msgid "Failed to exec gzip " msgstr "Misslyckades att köra gzip" -#: apt-inst/contrib/extracttar.cc:180 -#: apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "Fördärvat arkiv" @@ -1432,8 +1402,7 @@ msgstr "Ogiltig arkivsignatur" msgid "Error reading archive member header" msgstr "Misslyckades att läsa huvud för arkivdel" -#: apt-inst/contrib/arfile.cc:93 -#: apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" msgstr "Ogiltigt arkivdelshuvud" @@ -1477,21 +1446,17 @@ msgstr "Omdirigering %s -> %s inlagd tv msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:45 -#: apt-inst/dirstream.cc:50 -#: apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades att skriva filen %s" -#: apt-inst/dirstream.cc:80 -#: apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades att stänga filen %s" -#: apt-inst/extract.cc:96 -#: apt-inst/extract.cc:167 +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" msgstr "Sökvägen %s är för lång" @@ -1511,8 +1476,7 @@ msgstr "Katalogen %s msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketet försöker skriva till omdirigeringsmålet %s/%s" -#: apt-inst/extract.cc:157 -#: apt-inst/extract.cc:300 +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" msgstr "Omdirigeringssökvägen är för lång" @@ -1540,11 +1504,8 @@ msgstr "Skriver 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:467 -#: apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 -#: apt-pkg/acquire.cc:417 -#: apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunde inte läsa %s" @@ -1554,14 +1515,12 @@ msgstr "Kunde inte l msgid "Unable to stat %s" msgstr "Kunde inte ta status på %s" -#: apt-inst/deb/dpkgdb.cc:55 -#: apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" msgstr "Misslyckades att ta bort %s" -#: apt-inst/deb/dpkgdb.cc:110 -#: apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" msgstr "Kunde inte skapa %s" @@ -1576,10 +1535,8 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Katalogerna info och temp måste ligga på samma filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 -#: apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 -#: apt-pkg/pkgcachegen.cc:717 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 +#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 #: apt-pkg/pkgcachegen.cc:840 msgid "Reading package lists" msgstr "Läser paketlistor" @@ -1590,8 +1547,7 @@ msgstr "L msgid "Failed to change to the admin dir %sinfo" msgstr "Kunde inte gå till adminkatalogen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 -#: apt-inst/deb/dpkgdb.cc:355 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" msgstr "Internt fel när namn på Package-fil skulle hämtas" @@ -1602,11 +1558,15 @@ msgstr "L #: apt-inst/deb/dpkgdb.cc:216 #, c-format -msgid "Failed to open the list file '%sinfo/%s'. If you cannot restore this file then make it empty and immediately re-install the same version of the package!" -msgstr "Misslyckades att öppna listfilen \"%sinfo/%s\". Om du inte kan återskapa filen, skapa en tom och installera omedelbart om samma version av paketet!" +msgid "" +"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " +"then make it empty and immediately re-install the same version of the " +"package!" +msgstr "" +"Misslyckades att öppna listfilen \"%sinfo/%s\". Om du inte kan återskapa " +"filen, skapa en tom och installera omedelbart om samma version av paketet!" -#: apt-inst/deb/dpkgdb.cc:229 -#: apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Misslyckades att läsa listfilen %sinfo/%s" @@ -1624,8 +1584,7 @@ msgstr "Misslyckades att msgid "The diversion file is corrupted" msgstr "Omdirigeringsfilen är trasig" -#: apt-inst/deb/dpkgdb.cc:331 -#: apt-inst/deb/dpkgdb.cc:336 +#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 #: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" @@ -1658,8 +1617,7 @@ msgstr "Felaktiv ConfFile-sektion i statusfilen. Offset %lu" msgid "Error parsing MD5. Offset %lu" msgstr "Fel vid tolkning av MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 -#: apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" @@ -1693,8 +1651,12 @@ msgid "Unable to read the cdrom database %s" msgstr "Kunde inte läsa cd-rom-databasen %s" #: methods/cdrom.cc:123 -msgid "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update cannot be used to add new CD-ROMs" -msgstr "Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan inte användas för att lägga till skivor" +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" +"Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan " +"inte användas för att lägga till skivor" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" @@ -1709,22 +1671,16 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande anv msgid "Disk not found." msgstr "Disk ej funnen." -#: methods/cdrom.cc:177 -#: methods/file.cc:79 -#: methods/rsh.cc:264 +#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Filen ej funnen" -#: methods/copy.cc:42 -#: methods/gpgv.cc:265 -#: methods/gzip.cc:133 +#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133 #: methods/gzip.cc:142 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:79 -#: methods/gpgv.cc:262 -#: methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Misslyckades sätta modifieringstid" @@ -1745,8 +1701,7 @@ msgstr "Kunde inte ta reda p msgid "Unable to determine the local name" msgstr "Kunde inte ta reda på eget namn" -#: methods/ftp.cc:204 -#: methods/ftp.cc:232 +#: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" msgstr "Servern nekade anslutningen och sade: %s" @@ -1762,8 +1717,12 @@ msgid "PASS failed, server said: %s" msgstr "PASS misslyckades, servern sade: %s" #: methods/ftp.cc:237 -msgid "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin is empty." -msgstr "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::ProxyLogin är tom." +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::" +"ProxyLogin är tom." #: methods/ftp.cc:265 #, c-format @@ -1775,10 +1734,7 @@ msgstr "Inloggningsskriptskommandot \"%s\" misslyckades, servern sade: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE misslyckades, servern sade: %s" -#: methods/ftp.cc:329 -#: methods/ftp.cc:440 -#: methods/rsh.cc:183 -#: methods/rsh.cc:226 +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "Inget svar på förbindelsen inom tidsgränsen" @@ -1786,31 +1742,23 @@ msgstr "Inget svar p msgid "Server closed the connection" msgstr "Servern stängde förbindelsen" -#: methods/ftp.cc:338 -#: apt-pkg/contrib/fileutl.cc:471 -#: methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Läsfel" -#: methods/ftp.cc:345 -#: methods/rsh.cc:197 +#: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "Ett svar spillde bufferten." -#: methods/ftp.cc:362 -#: methods/ftp.cc:374 +#: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" msgstr "Protokollet fördärvat" -#: methods/ftp.cc:446 -#: apt-pkg/contrib/fileutl.cc:510 -#: methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" -#: methods/ftp.cc:687 -#: methods/ftp.cc:693 -#: methods/ftp.cc:729 +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" msgstr "Kunde inte skapa uttag (socket)" @@ -1860,9 +1808,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: methods/ftp.cc:864 -#: methods/http.cc:920 -#: methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -1871,8 +1817,7 @@ msgstr "Problem med att l msgid "Unable to fetch file, server said '%s'" msgstr "Kunde inte hämta filen, servern sade \"%s\"" -#: methods/ftp.cc:892 -#: methods/rsh.cc:322 +#: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Datauttag (socket) fick inte svar inom tidsgräns" @@ -1925,8 +1870,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:134 -#: methods/rsh.cc:425 +#: methods/connect.cc:134 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" @@ -1957,8 +1901,10 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar." #: methods/gpgv.cc:191 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "" +"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" #: methods/gpgv.cc:196 msgid "At least one invalid signature was encountered." @@ -1982,8 +1928,12 @@ msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" #: methods/gpgv.cc:244 -msgid "The following signatures couldn't be verified because the public key is not available:\n" -msgstr "Följande signaturer kunde inte verifieras för att den publika nyckeln inte är tillgänglig:\n" +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" +"Följande signaturer kunde inte verifieras för att den publika nyckeln inte " +"är tillgänglig:\n" #: methods/gzip.cc:57 #, c-format @@ -2009,8 +1959,7 @@ msgstr "Fick en ensam huvudrad p msgid "Bad header line" msgstr "Trasig huvudrad" -#: methods/http.cc:517 -#: methods/http.cc:524 +#: methods/http.cc:517 methods/http.cc:524 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern sände ett ogiltigt svarshuvud" @@ -2124,8 +2073,7 @@ msgstr "Syntaxfel %s:%u: Direktiv kan endast utf 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:695 -#: apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfel %s:%u: Inkluderad härifrån" @@ -2155,8 +2103,7 @@ msgstr "%c%s... F msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandoradsflagga \"%c\" [från %s] är ej känd." -#: apt-pkg/contrib/cmndline.cc:106 -#: apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" @@ -2167,14 +2114,12 @@ msgstr "F msgid "Command line option %s is not boolean" msgstr "Kommandoradsflaggan %s är inte boolsk" -#: apt-pkg/contrib/cmndline.cc:166 -#: apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." msgstr "Flaggan %s kräver ett värde." -#: apt-pkg/contrib/cmndline.cc:201 -#: apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Flagga %s: Den angivna konfigurationsposten måste innehålla =." @@ -2205,9 +2150,7 @@ msgid "Unable to stat the mount point %s" msgstr "Kunde inte ta status på monteringspunkt %s." # Felmeddelande för misslyckad chdir -#: apt-pkg/contrib/cdromutl.cc:149 -#: apt-pkg/acquire.cc:423 -#: apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kunde inte gå till %s" @@ -2355,8 +2298,7 @@ msgstr "valbart" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 -#: apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 msgid "Building dependency tree" msgstr "Bygger beroendeträd" @@ -2408,8 +2350,7 @@ msgstr "Rad %lu i k msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:170 -#: apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u för lång i källistan %s." @@ -2424,16 +2365,22 @@ msgstr "Rad %u i k msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen \"%s\" är okänd på rad %u i källistan %s" -#: apt-pkg/sourcelist.cc:199 -#: apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" #: apt-pkg/packagemanager.cc:402 #, 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 "För att genomföra denna installation måste det systemkritiska paketet %s tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. Detta är oftast en dålig idé, men om du verkligen vill göra det kan du aktivera flaggan \"APT::Force-LoopBreak\"." +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 "" +"För att genomföra denna installation måste det systemkritiska paketet %s " +"tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. " +"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:37 #, c-format @@ -2442,12 +2389,18 @@ msgstr "Indexfiler av typ \"%s\" st #: apt-pkg/algorithms.cc:241 #, 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." +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:1059 -msgid "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages." -msgstr "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på hållna paket." +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " +"hållna paket." #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." @@ -2601,8 +2554,7 @@ msgstr "Kunde inte ta status p msgid "Collecting File Provides" msgstr "Samlar filberoenden" -#: apt-pkg/pkgcachegen.cc:785 -#: apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" @@ -2611,24 +2563,32 @@ msgstr "In-/utfel vid lagring av k msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 -#: apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stämmer inte" #: apt-pkg/acquire-item.cc:722 #, 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 "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du manuellt måste reparera detta paket (på grund av saknad arkitektur)." +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 "" +"Jag kunde inte lokalisera 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:775 #, c-format -msgid "I wasn't able to locate file for the %s package. This might mean you need to manually fix this package." -msgstr "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du manuellt måste reparera detta paket." +msgid "" +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." +msgstr "" +"Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " +"manuellt måste reparera detta paket." #: apt-pkg/acquire-item.cc:811 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är trasiga. Inget \"Filename:\"-fält för paketet %s." #: apt-pkg/acquire-item.cc:898 @@ -2649,8 +2609,7 @@ msgstr "" "Använder cd-rom-monteringspunkt %s\n" "Monterar cd-rom\n" -#: apt-pkg/cdrom.cc:516 -#: apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identifierar.. " @@ -2791,6 +2750,7 @@ msgstr "F #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Okänt leverantörs-id \"%s\" pÃ¥ rad %u i källistan %s" + #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" @@ -2799,8 +2759,8 @@ msgstr "F #~ "Trasiga paket hittades när byggberoenden behandlades. Du kan " #~ "möjligen\n" #~ "rätta detta genom att köra \"apt-get -f install\"." + #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" #~ "Beklagar, men du har inte tillräckligt ledigt utrymme pÃ¥ %s för att " #~ "lagra alla .deb-filerna." - diff --git a/po/tl.po b/po/tl.po index f46d8a74d..58c30347d 100644 --- a/po/tl.po +++ b/po/tl.po @@ -394,9 +394,12 @@ msgstr "" "at kapalit ng dpkg-scanpackages at dpkg-scansources\n" "\n" "Bumubuo ang apt-ftparchive ng mga talaksang Package mula sa puno ng mga\n" -".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control field\n" -"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. Suportado\n" -"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at Section.\n" +".deb. Ang talaksang Package ay naglalaman ng laman ng lahat ng control " +"field\n" +"mula sa bawat pakete pati na rin ang MD5 hash at laki ng talaksan. " +"Suportado\n" +"ang pag-gamit ng talaksang override upang pilitin ang halaga ng Priority at " +"Section.\n" "\n" "Bumubuo din ang apt-ftparchive ng talaksang Sources mula sa puno ng mga\n" ".dsc. Ang option na --source-override ay maaaring gamitin upang itakda\n" @@ -405,7 +408,8 @@ msgstr "" "Ang mga utos na 'packages' at 'sources' ay dapat patakbuhin sa ugat ng\n" "puno. Kailangan nakaturo ang BinaryPath sa ugat ng paghahanap na recursive\n" "at ang talaksang override ay dapat naglalaman ng mga flag na override. Ang\n" -"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung mayroon.\n" +"pathprefix ay dinudugtong sa harap ng mga pangalan ng talaksan kung " +"mayroon.\n" "Halimbawa ng pag-gamit mula sa arkibong Debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -774,7 +778,8 @@ msgstr "" #: cmdline/apt-get.cc:691 msgid "Authentication warning overridden.\n" -msgstr "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" +msgstr "" +"Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" #: cmdline/apt-get.cc:698 msgid "Install these packages without verification [y/N]? " @@ -790,7 +795,8 @@ msgstr "May mga problema at -y ay ginamit na walang --force-yes" #: cmdline/apt-get.cc:753 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" +msgstr "" +"Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" #: cmdline/apt-get.cc:762 msgid "Packages need to be removed but remove is disabled." @@ -812,7 +818,9 @@ msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." #: cmdline/apt-get.cc:814 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.org" +msgstr "" +"Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." +"org" #: cmdline/apt-get.cc:819 #, c-format @@ -1891,12 +1899,16 @@ msgstr "Hindi maka-konek sa %s %s:" #: methods/gpgv.cc:92 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. Lalabas." +msgstr "" +"E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. " +"Lalabas." #: methods/gpgv.cc:191 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key fingerprint?!" +msgstr "" +"Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " +"fingerprint?!" #: methods/gpgv.cc:196 msgid "At least one invalid signature was encountered." @@ -2167,7 +2179,8 @@ msgstr "Hindi mabuksan ang talaksang aldaba %s" #, 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" +"Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " +"nfs" #: apt-pkg/contrib/fileutl.cc:109 #, c-format @@ -2428,7 +2441,8 @@ msgstr "Hindi umandar ng tama ang paraang %s" #: apt-pkg/acquire-worker.cc:377 #, 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." +msgstr "" +"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." #: apt-pkg/init.cc:119 #, c-format @@ -2750,4 +2764,5 @@ msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -#~ msgstr "Hindi kilalang vendor ID '%s' sa linya %u ng talaksang pagkukunan %s" +#~ msgstr "" +#~ "Hindi kilalang vendor ID '%s' sa linya %u ng talaksang pagkukunan %s" -- cgit v1.2.3 From f2047f6b2aa62632b670343d4275be4d69f4b5e3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 21 Nov 2005 10:33:57 +0000 Subject: * pkgDirStream has (slightly) better extract support now --- apt-inst/dirstream.cc | 16 ++++++++++++++++ configure.in | 2 +- debian/changelog | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index 7ae93c9b0..898ede31b 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -61,6 +61,22 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd) case Item::CharDevice: case Item::BlockDevice: case Item::Directory: + { + struct stat Buf; + // check if the dir is already there, if so return true + if (stat(Itm.Name,&Buf) == 0) + { + if(S_ISDIR(Buf.st_mode)) + return true; + // something else is there already, return false + return false; + } + // nothing here, create the dir + if(mkdir(Itm.Name,Itm.Mode) < 0) + return false; + return true; + break; + } case Item::FIFO: break; } diff --git a/configure.in b/configure.in index 6130ab544..bc5d2b572 100644 --- a/configure.in +++ b/configure.in @@ -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) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3") +AC_DEFINE_UNQUOTED(VERSION,"0.6.42.4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 2a636ae30..9115faabc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.6.42.4) unstable; urgency=low * gl.po: Completed to 510 strings (Closes: #338356) * added support for "/etc/apt/sources.list.d" directory (closes: #66325) + * make pkgDirStream (a bit) more complete -- -- cgit v1.2.3 From dc1f50b9ddb8f7643285d761eeb2e53f8f041adc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 21 Nov 2005 14:33:21 +0000 Subject: * merge fix for #339533 --- apt-pkg/cacheiterators.h | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index c3a0d0a5a..2b326bd65 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -107,7 +107,7 @@ class pkgCache::VerIterator // Iteration void operator ++(int) {if (Ver != Owner->VerP) Ver = Owner->VerP + Ver->NextVer;}; inline void operator ++() {operator ++(0);}; - inline bool end() const {return Ver == Owner->VerP?true:false;}; + inline bool end() const {return Owner == NULL || (Ver == Owner->VerP?true:false);}; inline void operator =(const VerIterator &B) {Ver = B.Ver; Owner = B.Owner;}; // Comparison diff --git a/debian/changelog b/debian/changelog index 9115faabc..7399b695e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.6.42.4) unstable; urgency=low * added support for "/etc/apt/sources.list.d" directory (closes: #66325) * make pkgDirStream (a bit) more complete + * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows) + (closes: #339533) -- -- cgit v1.2.3 From 71a174eec0debaed2159b043ff6ef81cd618408b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2005 12:42:42 +0000 Subject: * some more debug output --- apt-pkg/packagemanager.cc | 4 +- debian/changelog | 2 +- po/bs.po | 139 ++++++++++++++++++++++----------------------- po/ca.po | 141 +++++++++++++++++++++++----------------------- po/cs.po | 141 +++++++++++++++++++++++----------------------- po/da.po | 141 +++++++++++++++++++++++----------------------- po/de.po | 141 +++++++++++++++++++++++----------------------- po/el.po | 141 +++++++++++++++++++++++----------------------- po/en_GB.po | 139 ++++++++++++++++++++++----------------------- po/es.po | 141 +++++++++++++++++++++++----------------------- po/eu.po | 141 +++++++++++++++++++++++----------------------- po/fi.po | 141 +++++++++++++++++++++++----------------------- po/fr.po | 141 +++++++++++++++++++++++----------------------- po/he.po | 139 ++++++++++++++++++++++----------------------- po/hu.po | 141 +++++++++++++++++++++++----------------------- po/it.po | 141 +++++++++++++++++++++++----------------------- po/ja.po | 141 +++++++++++++++++++++++----------------------- po/ko.po | 141 +++++++++++++++++++++++----------------------- po/nb.po | 141 +++++++++++++++++++++++----------------------- po/nl.po | 141 +++++++++++++++++++++++----------------------- po/nn.po | 141 +++++++++++++++++++++++----------------------- po/pl.po | 141 +++++++++++++++++++++++----------------------- po/pt.po | 141 +++++++++++++++++++++++----------------------- po/pt_BR.po | 141 +++++++++++++++++++++++----------------------- po/ro.po | 141 +++++++++++++++++++++++----------------------- po/ru.po | 141 +++++++++++++++++++++++----------------------- po/sk.po | 141 +++++++++++++++++++++++----------------------- po/sl.po | 141 +++++++++++++++++++++++----------------------- po/sv.po | 141 +++++++++++++++++++++++----------------------- po/tl.po | 141 +++++++++++++++++++++++----------------------- po/zh_CN.po | 141 +++++++++++++++++++++++----------------------- po/zh_TW.po | 141 +++++++++++++++++++++++----------------------- 32 files changed, 2131 insertions(+), 2099 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 155408bb4..4b3dd8be2 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -593,7 +593,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() Pkg.State() == pkgCache::PkgIterator::NeedsNothing && (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall) { - _error->Error("Internal Error, trying to manipulate a kept package"); + _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name()); return Failed; } @@ -634,6 +634,8 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd) { OrderResult Res = OrderInstall(); + if(Debug) + std::clog << "OrderInstall() returned: " << Res << std::endl; if (Res != Failed) if (Go(status_fd) == false) return Failed; diff --git a/debian/changelog b/debian/changelog index c7e2fea58..bca8a14b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,7 @@ apt (0.6.42.4) unstable; urgency=low * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows) (closes: #339533) - -- + -- apt (0.6.42.3) unstable; urgency=low diff --git a/po/bs.po b/po/bs.po index e79db9027..759e653e4 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: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -147,7 +147,7 @@ msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -547,7 +547,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -708,11 +708,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -741,7 +741,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -776,7 +776,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -785,7 +785,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "" @@ -877,45 +877,45 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -923,158 +923,158 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "OÅ¡tećeni paketi" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "PreporuÄeni paketi:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "RaÄunam nadogradnju..." -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "NeuspjeÅ¡no" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "UraÄ‘eno" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1275,7 +1275,7 @@ msgstr "" msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "" @@ -1328,7 +1328,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ne mogu Äitati %s" @@ -2128,52 +2129,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2237,12 +2238,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2360,7 +2361,7 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" @@ -2371,20 +2372,20 @@ msgid "" "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" diff --git a/po/ca.po b/po/ca.po index a49bc03f9..78aa65657 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" @@ -638,7 +638,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -801,11 +801,11 @@ msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." @@ -835,7 +835,7 @@ msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@ -872,7 +872,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -881,7 +881,7 @@ msgstr "No s'ha pogut obtenir %s %s\n" msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" @@ -980,15 +980,15 @@ msgstr "No s'ha trobat la versió «%s» per a «%s»" msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -996,25 +996,25 @@ msgstr "" "No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " "s'han usat els antics." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 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:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1022,7 +1022,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1034,7 +1034,7 @@ msgstr "" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1044,119 +1044,119 @@ msgstr "" "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" "un informe d'error en contra d'aquest per a arxivar-lo." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "La següent informació pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 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:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a descarregar" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, 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:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1165,7 +1165,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1174,32 +1174,32 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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 instal·lat %s " "és massa nou" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, 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:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1457,7 +1457,7 @@ msgstr "Fitxer de conf. duplicat %s/%s" msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" @@ -1510,7 +1510,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@ -2322,52 +2323,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, 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:89 +#: apt-pkg/sourcelist.cc:96 #, 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:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, 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:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in 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:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)" @@ -2443,12 +2444,12 @@ msgstr "" " '%s'\n" "en la unitat de '%s' i premeu Intro\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament '%s' no està suportat." -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." @@ -2572,7 +2573,7 @@ msgstr "Error d'E/S en desar la memòria cau de la font" msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" @@ -2586,7 +2587,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2595,7 +2596,7 @@ msgstr "" "No ha estat possible localitzar un fitxer pel paquet %s. Això podria " "significar que haureu d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2603,7 +2604,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Mida diferent" diff --git a/po/cs.po b/po/cs.po index 0b590f885..f07a7ccb5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -147,7 +147,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" @@ -633,7 +633,7 @@ msgstr "Selhalo pÅ™ejmenování %s na %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pÅ™i kompilaci regulárního výrazu - %s" @@ -796,11 +796,11 @@ msgstr "Balík je potÅ™eba odstranit ale funkce Odstranit je vypnuta." msgid "Internal error, Ordering didn't finish" msgstr "VnitÅ™ní chyba pÅ™i pÅ™idávání diverze" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nelze pÅ™eÄíst seznam zdrojů." @@ -829,7 +829,7 @@ msgstr "Po rozbalení bude na disku použito dalších %sB.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolnÄ›no %sB.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s nemáte dostatek volného místa" @@ -866,7 +866,7 @@ msgstr "PÅ™eruÅ¡eno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokraÄovat [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -875,7 +875,7 @@ msgstr "Selhalo stažení %s %s\n" msgid "Some files failed to download" msgstr "NÄ›které soubory nemohly být staženy" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Stahování dokonÄeno v režimu pouze stáhnout" @@ -972,15 +972,15 @@ msgstr "Verze '%s' pro '%s' nebyla nalezena" msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -988,25 +988,25 @@ msgstr "" "NÄ›které indexové soubory se nepodaÅ™ilo stáhnout, jsou ignorovány, nebo jsou " "použity starší verze." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "VnitÅ™ní chyba, AllUpgrade pokazil vÄ›ci" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 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':" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1014,7 +1014,7 @@ msgstr "" "NesplnÄ›né závislosti. Zkuste zpustit 'apt-get -f install' bez balíků (nebo " "navrhnÄ›te Å™eÅ¡ení)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1025,7 +1025,7 @@ 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." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1035,124 +1035,124 @@ msgstr "" "balík není instalovatelný a mÄ›l byste o tom zaslat hlášení o chybÄ›\n" "(bug report)." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyÅ™eÅ¡it tuto situaci:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "PoÅ¡kozené balíky" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Následujcící extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "DoporuÄované balíky:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "PropoÄítávám aktualizaci..." -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "VnitÅ™ní chyba, AllUpgrade pokazil vÄ›ci" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "PotÅ™ebuji stáhnout %sB/%sB zdrojových archívů.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "PotÅ™ebuji stáhnout %sB zdrojových archívů.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Stažení nÄ›kterých archívů selhalo." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splnÄ›na, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1161,31 +1161,31 @@ msgstr "" "%s závislost pro %s nemůže být splnÄ›na protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnÄ›ní %s závislosti pro %s: Instalovaný balík %s je příliÅ¡ nový" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnÄ›ní %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, 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:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Chyba pÅ™i zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1436,7 +1436,7 @@ msgstr "Duplicitní konfiguraÄní soubor %s/%s" msgid "Failed to write file %s" msgstr "Selhal zápis do souboru %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavÅ™ení souboru %s" @@ -1489,7 +1489,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nemohu Äíst %s" @@ -2295,52 +2296,52 @@ msgstr "Nelze zpracovat soubor %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" @@ -2412,12 +2413,12 @@ msgstr "" " '%s'\n" "do mechaniky '%s' a stisknÄ›te enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "BalíÄkovací systém '%s' není podporován" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno urÄit vhodný typ balíÄkovacího systému" @@ -2538,7 +2539,7 @@ msgstr "Chyba IO pÅ™i ukládání zdrojové cache" msgid "rename failed, %s (%s -> %s)." msgstr "pÅ™ejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 souÄtů" @@ -2551,7 +2552,7 @@ msgstr "" "Nebyl jsem schopen 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2560,14 +2561,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ruÄnÄ›." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, 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/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" diff --git a/po/da.po b/po/da.po index 3d5a009ff..fa3780068 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-11-07 15:28+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s oversat på %s %s\n" @@ -635,7 +635,7 @@ msgstr "Kunne ikke omd msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulært udtryk - %s" @@ -796,11 +796,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldført" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Kunne ikke låse nedhentningsmappen" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke læses." @@ -829,7 +829,7 @@ msgstr "Efter udpakning vil %sB yderligere diskplads v msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" @@ -866,7 +866,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsætte [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -875,7 +875,7 @@ msgstr "Kunne ikke hente %s %s\n" msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" @@ -974,15 +974,15 @@ msgstr "Versionen '%s' for '%s' blev ikke fundet" msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kunne ikke låse listemappen" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -990,25 +990,25 @@ msgstr "" "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " "bruges i stedet." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade ødelagde noget" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 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':" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1016,7 +1016,7 @@ msgstr "" "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv " "en løsning)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1027,7 +1027,7 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgængelige." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1036,114 +1036,114 @@ msgstr "" "Siden du kan bad om en enkelt handling, kan pakken højst sandsynligt slet\n" "ikke installeres og du bør indsende en fejlrapport for denne pakke." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Følgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Foreslåede pakker:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Færdig" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemløseren ødelagde noget" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, 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:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhængigheder.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1151,7 +1151,7 @@ msgid "" msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1160,32 +1160,32 @@ msgstr "" "%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhængighederne" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Understøttede moduler:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1442,7 +1442,7 @@ msgstr "Dobbelt ops msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" @@ -1495,7 +1495,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overskriver filen i pakken %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke læse %s" @@ -2302,52 +2303,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Åbner %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" @@ -2419,12 +2420,12 @@ msgstr "Metoden %s startede ikke korrekt" 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:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understøttes ikke" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" @@ -2544,7 +2545,7 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret" msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" @@ -2557,7 +2558,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2566,13 +2567,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, 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/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" diff --git a/po/de.po b/po/de.po index 23f79dfe3..2fba11000 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s für %s %s kompiliert am %s %s\n" @@ -646,7 +646,7 @@ msgstr "Konnte %s nicht in %s umbenennen" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" @@ -810,11 +810,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@ -845,7 +845,7 @@ msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" @@ -882,7 +882,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" @@ -891,7 +891,7 @@ msgstr "Konnte %s nicht holen %s\n" msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" @@ -991,15 +991,15 @@ msgstr "Version »%s« für »%s« konnte nicht gefunden werden" msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Der Befehl »update« nimmt keine Argumente" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1007,27 +1007,27 @@ msgstr "" "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Achtung, wähle %s für reg. Ausdruck »%s«\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu " "korrigieren:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1035,7 +1035,7 @@ msgstr "" "Nichterfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " "jeglich Pakete (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1047,7 +1047,7 @@ msgstr "" "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1058,119 +1058,119 @@ msgstr "" "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ãœberspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden." -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1179,7 +1179,7 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1188,32 +1188,32 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare " "Version von Paket %s die Versionsanforderungen erfüllen kann." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " "zu neu." -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1474,7 +1474,7 @@ msgstr "Doppelte Konfigurationsdatei %s/%s" msgid "Failed to write file %s" msgstr "Konnte nicht in Datei %s schreiben" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Konnte Datei %s nicht schließen" @@ -1527,7 +1527,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Datei %s/%s überschreibt die Datei in Paket %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kann %s nicht lesen" @@ -2342,52 +2343,52 @@ msgstr "Kann Paketdatei %s nicht parsen (1)" msgid "Unable to parse package file %s (2)" msgstr "Kann Paketdatei %s nicht parsen (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" @@ -2462,12 +2463,12 @@ msgstr "" " »%s«\n" "in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketierungssystem »%s« wird nicht unterstützt" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" @@ -2596,7 +2597,7 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches" msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" @@ -2609,7 +2610,7 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2618,14 +2619,14 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Größe stimmt nicht" diff --git a/po/el.po b/po/el.po index e10c02d95..3f0b4ac9f 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: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-07-14 14:25EEST\n" "Last-Translator: Greek Translation Team \n" @@ -161,7 +161,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" @@ -653,7 +653,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -819,11 +819,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "ΕσωτεÏικό Σφάλμα στην Ï€Ïοσθήκη μιας παÏάκαμψης" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "ΑδÏνατο το κλείδωμα του καταλόγου μεταφόÏτωσης" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "ΑδÏνατη η ανάγνωση της λίστας πηγών." @@ -852,7 +852,7 @@ msgstr "Μετά την αποσυμπίεση θα χÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸Î¿Ï msgid "After unpacking %sB disk space will be freed.\n" msgstr "Μετά την αποσυμπίεση θα ελευθεÏωθοÏν %sB χώÏου από το δίσκο.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν διαθέτετε αÏκετό ελεÏθεÏο χώÏο στο %s" @@ -889,7 +889,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Î/ο]; " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -898,7 +898,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n" msgid "Some files failed to download" msgstr "Για μεÏικά αÏχεία απέτυχε η μεταφόÏτωση" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "ΟλοκληÏώθηκε η μεταφόÏτωση μόνο" @@ -1000,15 +1000,15 @@ msgstr "Η έκδοση %s για το %s δεν βÏέθηκε" msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίÏνει οÏίσματα" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "ΑδÏνατο το κλείδωμα του καταλόγου" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1016,25 +1016,25 @@ msgstr "" "ΜεÏικά αÏχεία δεν μεταφοÏτώθηκαν, αγνοήθηκαν ή χÏησιμοποιήθηκαν παλαιότεÏα " "στη θέση τους." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "ΕσωτεÏικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "ΑδÏνατη η εÏÏεση του πακέτου %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν Ï„Ïέξετε 'apt-get f install' ίσως να διοÏθώσετε αυτά τα Ï€Ïοβλήματα:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1042,7 +1042,7 @@ msgstr "" "Ανεπίλυτες εξαÏτήσεις. Δοκιμάστε 'apt-get -f install' χωÏίς να οÏίσετε " "πακέτο (ή καθοÏίστε μια λÏση)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1054,7 +1054,7 @@ msgstr "" "διανομή, ότι μεÏικά από τα πακέτα δεν έχουν ακόμα δημιουÏγηθεί ή έχουν\n" "μετακινηθεί από τα εισεÏχόμενα." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1064,118 +1064,118 @@ msgstr "" "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα Ï€Ïέπει να κάνετε μια\n" "αναφοÏά σφάλματος για αυτό το πακέτο." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληÏοφοÏίες ίσως βοηθήσουν στην επίλυση του Ï€Ïοβλήματος:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθοÏν:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "ΠÏοτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "ΕσωτεÏικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα Ï€Ïέπει να καθοÏίσετε τουλάχιστον ένα πακέτο για να μεταφοÏτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï Ï„Î¿Ï… κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αÏκετό ελεÏθεÏο χώÏο στο %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ΧÏειάζεται να μεταφοÏτωθοÏν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ΧÏειάζεται να μεταφοÏτωθοÏν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "ΜεταφόÏτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόÏτωσης μεÏικών αÏχειοθηκών." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "ΠαÏάκαμψη της αποσυμπίεσης ήδη μεταφοÏτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Η απογονική διεÏγασία απέτυχε" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα Ï€Ïέπει να καθοÏίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαÏτήσεων του" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ΑδÏνατη η εÏÏεση πληÏοφοÏιών χτισίματος για το %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαÏτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1183,7 +1183,7 @@ msgid "" msgstr "" "%s εξαÏτήσεις για το %s δεν ικανοποιοÏνται επειδή το πακέτο %s δεν βÏέθηκε" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1192,32 +1192,32 @@ msgstr "" "%s εξαÏτήσεις για το %s δεν ικανοποιοÏνται επειδή δεν υπάÏχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιοÏν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαÏτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτεÏο" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάÏτησης για το %s: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαÏτήσεις χτισίματος για το %s δεν ικανοποιοÏνται." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεÏγασίας εξαÏτήσεων χτισίματος" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "ΥποστηÏιζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1474,7 +1474,7 @@ msgstr "Διπλό αÏχείο Ïυθμίσεων %s/%s" msgid "Failed to write file %s" msgstr "Αποτυχία εγγÏαφής στο αÏχείο %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αÏχείου %s" @@ -1527,7 +1527,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Το αÏχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "ΑδÏνατη η ανάγνωση του %s" @@ -2339,52 +2340,52 @@ msgstr "ΑδÏνατη η ανάλυση του αÏχείου πακέτου %s msgid "Unable to parse package file %s (2)" msgstr "ΑδÏνατη η ανάλυση του αÏχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μοÏφή της γÏαμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γÏαμμή %u έχει υπεÏβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μοÏφή της γÏαμμής %u στη λίστα πηγών %s (Ï„Ïπος)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Ο Ï„Ïπος '%s' στη γÏαμμή %u στη λίστα πηγών %s είναι άγνωστος" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μοÏφή της γÏαμμής %u στη λίστα πηγών %s (id κατασκευαστή)" @@ -2459,12 +2460,12 @@ msgstr "" " '%s'\n" "στη συσκευή '%s' και πιέστε enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Το σÏστημα συσκευασίας '%s' δεν υποστηÏίζεται" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "ΑδÏνατος ο καθοÏισμός ενός κατάλληλου Ï„Ïπου συστήματος πακέτων" @@ -2588,7 +2589,7 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" @@ -2601,7 +2602,7 @@ msgstr "" "ΑδÏνατος ο εντοπισμός ενός αÏχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χÏειάζεται να διοÏθώσετε χειÏοκίνητα το πακέτο. (λόγω χαμένου αÏχείου)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2610,7 +2611,7 @@ msgstr "" "ΑδÏνατος ο εντοπισμός ενός αÏχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χÏειάζεται να διοÏθώσετε χειÏοκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2618,7 +2619,7 @@ msgstr "" "ΚατεστÏαμμένα αÏχεία ευÏετηÏίου πακέτων. Δεν υπάÏχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" diff --git a/po/en_GB.po b/po/en_GB.po index a0d593d31..fce5ac0f2 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@ -147,7 +147,7 @@ msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -578,7 +578,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -737,11 +737,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -770,7 +770,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -807,7 +807,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -816,7 +816,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "" @@ -908,39 +908,39 @@ msgstr "Version ‘%s’ for ‘%s’ was not found" msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run ‘apt-get -f install’ to correct these:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -948,7 +948,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -956,158 +956,158 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1311,7 +1311,7 @@ msgstr "" msgid "Failed to write file %s" msgstr "Could not resolve ‘%s’" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "" @@ -1364,7 +1364,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -2163,52 +2164,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, fuzzy, c-format -msgid "Type '%s' is not known on line %u in source list %s" +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Type ‘%s’ is not known in on line %u in source list %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2275,12 +2276,12 @@ msgstr "" " ‘%s’\n" "in the drive ‘%s’ and press enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2398,7 +2399,7 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" @@ -2409,20 +2410,20 @@ msgid "" "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" diff --git a/po/es.po b/po/es.po index 89233647c..30d9f3109 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: Spanish \n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" @@ -644,7 +644,7 @@ msgstr "Fall msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilación de expresiones regulares - %s" @@ -806,11 +806,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no terminó el ordenamiento" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." @@ -842,7 +842,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Se liberarán %sB después de desempaquetar.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" @@ -879,7 +879,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "¿Desea continuar [S/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -888,7 +888,7 @@ msgstr "Imposible obtener %s %s\n" msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de sólo descarga" @@ -985,15 +985,15 @@ msgstr "No se encontr msgid "Selected version %s (%s) for %s\n" msgstr "Versión seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "El comando de actualización no toma argumentos" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1001,25 +1001,25 @@ msgstr "" "Algunos archivos de índice no se han podido descargar, se han ignorado,\n" "o se ha utilizado unos antiguos en su lugar." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompió cosas" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresión regular '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1027,7 +1027,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solución)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1039,7 +1039,7 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1049,118 +1049,118 @@ msgstr "" "paquete simplemente no sea instalable y debería de rellenar un informe de\n" "error contra ese paquete." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "La siguiente información puede ayudar a resolver la situación:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Se instalarán los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Calculando la actualización... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falló" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solución de problemas rompió\n" "algunas cosas" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, 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:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Falló la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Falló la orden de construcción '%s'.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Falló el proceso hijo" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construcción" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construcción.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1169,7 +1169,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1178,32 +1178,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n" "disponible del paquete %s satisface los requisitos de versión" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, 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:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construcción" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1464,7 +1464,7 @@ msgstr "Archivo de configuraci msgid "Failed to write file %s" msgstr "Falló el cierre del archivo %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" @@ -1517,7 +1517,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" @@ -2327,52 +2328,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línea %lu mal formada en lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línea %lu mal formada en lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línea %lu mal formada en lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línea %lu mal formada en lista de fuentes %s (análisis de dist)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Línea %u mal formada en lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in 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:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Línea %u mal formada en la lista de fuentes %s (id del fabricante)" @@ -2449,12 +2450,12 @@ msgstr "" " '%s'\n" "en la unidad '%s' y presione Intro\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema de paquetes '%s' no está soportado" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" @@ -2580,7 +2581,7 @@ msgstr "Error de E/S guardando cach msgid "rename failed, %s (%s -> %s)." msgstr "falló el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" @@ -2594,7 +2595,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2603,7 +2604,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2611,7 +2612,7 @@ msgstr "" "Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "El tamaño difiere" diff --git a/po/eu.po b/po/eu.po index 7310e029d..87a8d212d 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: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-11-07 22:37+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale.org \n" @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s) konpilatua: %s %s\n" @@ -634,7 +634,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio-errorea - %s" @@ -795,11 +795,11 @@ msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga-direktorioa blokeatu" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Ezin izan da iturburu-zerrenda irakurri." @@ -830,7 +830,7 @@ msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." @@ -867,7 +867,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -876,7 +876,7 @@ msgstr "Ezin da lortu %s %s\n" msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" @@ -973,15 +973,15 @@ msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda-direktorioa blokeatu" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -989,25 +989,25 @@ msgstr "" "Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " "zaharrak erabili dira haien ordez." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1015,7 +1015,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1027,7 +1027,7 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1036,116 +1036,116 @@ msgstr "" "Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n" "izango, eta pakete horren errorearen berri ematea komeni da." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturubura\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze-mendekotasunik.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1153,7 +1153,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1162,32 +1162,32 @@ 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:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, 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:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1441,7 +1441,7 @@ msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s" msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" @@ -1494,7 +1494,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" @@ -2308,52 +2309,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "'%1$s' mota ez da ezagutzen %3$s iturburu-zerrendako %2$u lerroan" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (hornitzaile id-a)" @@ -2424,12 +2425,12 @@ msgstr "%s metodoa ez da behar bezala abiarazi" 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:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' pakete-sistema ez da onartzen" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu" @@ -2547,7 +2548,7 @@ msgstr "S/I errorea iturburu-cachea gordetzean" msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" @@ -2560,7 +2561,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2569,7 +2570,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2577,7 +2578,7 @@ msgstr "" "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Tamaina ez dator bat" diff --git a/po/fi.po b/po/fi.po index fa0102ec1..3b283058e 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: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n" @@ -639,7 +639,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -802,11 +802,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." @@ -835,7 +835,7 @@ msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" @@ -873,7 +873,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -882,7 +882,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n" msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" @@ -979,15 +979,15 @@ msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -995,25 +995,25 @@ msgstr "" "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " "käytetty vanhoja. " -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1021,7 +1021,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1032,7 +1032,7 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1042,116 +1042,116 @@ msgstr "" "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1159,7 +1159,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1168,32 +1168,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1447,7 +1447,7 @@ msgstr "Asetustiedoston kaksoiskappale %s/%s" msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" @@ -1500,7 +1500,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" @@ -2305,52 +2306,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, 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:89 +#: apt-pkg/sourcelist.cc:96 #, 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:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, 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:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" @@ -2422,12 +2423,12 @@ msgstr "" "\"%s\"\n" "asemaan \"%s\" ja paina Enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" @@ -2547,7 +2548,7 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" @@ -2560,7 +2561,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2569,7 +2570,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2577,7 +2578,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Koko ei täsmää" diff --git a/po/fr.po b/po/fr.po index f14a10b96..77674c048 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-11-01 18:16+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pour %s %s est compilé le %s %s\n" @@ -645,7 +645,7 @@ msgstr "Impossible de changer le nom %s en %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -808,11 +808,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a été interrompu." -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." @@ -844,7 +844,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Après dépaquetage, %so d'espace disque seront libérés.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" @@ -885,7 +885,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" @@ -894,7 +894,7 @@ msgstr "Impossible de r msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" @@ -994,15 +994,15 @@ msgstr "La version msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le répertoire de liste" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1010,26 +1010,26 @@ 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." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 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 :" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1037,7 +1037,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1049,7 +1049,7 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1058,118 +1058,118 @@ msgstr "" "Puisque vous n'avez demandé qu'une seule opération, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider à résoudre la situation : " -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Paquets défectueux" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Paquets recommandés :" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Échec" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 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:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, 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:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, 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:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, 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:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1178,7 +1178,7 @@ 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:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1187,33 +1187,33 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "du paquet %s ne peut satisfaire à la version requise" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, 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:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1473,7 +1473,7 @@ msgstr "Fichier de configuration en double %s/%s" msgid "Failed to write file %s" msgstr "Erreur d'écriture du fichier %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Échec de clôture du fichier %s" @@ -1526,7 +1526,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" @@ -2344,55 +2345,55 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, 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:89 +#: apt-pkg/sourcelist.cc:96 #, 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:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, 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:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in 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:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2469,12 +2470,12 @@ msgstr "" "Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la " "touche Entrée." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le système de paquet « %s » n'est pas supporté" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Impossible de déterminer un type du système de paquets adéquat" @@ -2605,7 +2606,7 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" @@ -2619,7 +2620,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2628,7 +2629,7 @@ msgstr "" "Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " "que vous devrez corriger manuellement ce paquet." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2636,7 +2637,7 @@ msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Taille incohérente" diff --git a/po/he.po b/po/he.po index 2ca30449f..1dd3d862f 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s בשביל %s %s קומפל על %s %s\n" @@ -535,7 +535,7 @@ msgstr "כשלון בשינוי ×”×©× %s ל-%s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -698,11 +698,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "×œ× ×ž×¦×œ×™×— לנעול ×ת ספרית ההורדה." -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "רשימת המקורות ×œ× × ×™×ª× ×ª לקרי××”." @@ -731,7 +731,7 @@ msgstr "×חרי פריסה %sB × ×•×¡×¤×™× ×™×”×™×• בשימוש.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "×חרי פריסה %sB × ×•×¡×¤×™× ×™×©×•×—×¨×¨×•.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "×ין לך מספיק ×ž×§×•× ×¤× ×•×™ ב-%s." @@ -766,7 +766,7 @@ msgstr "בטל." msgid "Do you want to continue [Y/n]? " msgstr "×”×× ×תה רוצה להמשיך? [Y/n]" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהב×ת %s %s\n" @@ -775,7 +775,7 @@ msgstr "כשלון בהב×ת %s %s\n" msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצי×" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." @@ -867,45 +867,45 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -913,159 +913,159 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "שגי××” פנימית, כלשון ביצירת %s" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1266,7 +1266,7 @@ msgstr "" msgid "Failed to write file %s" msgstr "כשלון בפענוח %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "" @@ -1319,7 +1319,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -2116,52 +2117,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2225,12 +2226,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2348,7 +2349,7 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "" @@ -2359,20 +2360,20 @@ msgid "" "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "" diff --git a/po/hu.po b/po/hu.po index a418bca8d..aa5d337bf 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" @@ -640,7 +640,7 @@ msgstr "Nem sikerült átnevezni a következÅ‘t: %s erre: %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -803,11 +803,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze msgid "Internal error, Ordering didn't finish" msgstr "BelsÅ‘ hiba egy eltérítés hozzáadásakor" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." @@ -836,7 +836,7 @@ msgstr "Kicsomagolás után %sB lemezterület lesz felhasználva.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterület kerül felszabadításra.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nincs elég szabad hely itt: %s" @@ -873,7 +873,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nem sikerült letölteni a következÅ‘t: %s %s\n" @@ -882,7 +882,7 @@ msgstr "Nem sikerült letölteni a következÅ‘t: %s %s\n" msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "A letöltés befejezÅ‘dött a 'csak letöltés' módban" @@ -979,15 +979,15 @@ msgstr "'%s' verzió ehhez: '%s' nem található" msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -995,26 +995,26 @@ msgstr "" "Néhány index fájlt nem sikerült letölteni, ezek mellÅ‘zve lesznek, vagy a " "régi változatuk lesz használva." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "BelsÅ‘ hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Nem található a(z) %s csomag" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "A következÅ‘k kijavításához próbáld futtatni az 'apt-get -f install'-t :" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1022,7 +1022,7 @@ msgstr "" "Teljesítetlen függÅ‘ségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függÅ‘ségeket is!)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1034,7 +1034,7 @@ msgstr "" "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1044,118 +1044,118 @@ msgstr "" "hogy a csomag egyszerűen nem telepíthetÅ‘ és egy hibajelentést kellene\n" "kitölteni a csomaghoz." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "A következÅ‘ információ talán segít megoldani a helyzetet:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "A következÅ‘ extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "BelsÅ‘ hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrásarchívot kell letölteni.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrásarchívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függÅ‘ségeit ellenÅ‘rizni " "kell" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függÅ‘ség információját beszerezni" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, 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:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1164,7 +1164,7 @@ msgstr "" "%s függÅ‘sége ennek: %s, ez nem elégíthetÅ‘ ki, mert a(z) %s csomag nem " "található" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1173,32 +1173,32 @@ msgstr "" "%s függÅ‘sége ennek: %s, ez nem elégíthetÅ‘ ki, mert a(z) %s csomagnak nincs a " "verziókövetelményt kielégítÅ‘ elérhetÅ‘ verziója." -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függÅ‘séget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függÅ‘séget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függÅ‘ségei nem elégíthetÅ‘ek ki." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függÅ‘ségeket feldolgozni" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1450,7 +1450,7 @@ msgstr "Dupla %s/%s konfigurációs fájl" msgid "Failed to write file %s" msgstr "Nem sikerült a(z) %s fájlba írni" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Nem sikerült a(z) %s fájlt bezárni" @@ -1503,7 +1503,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "A(z) %s nem olvasható" @@ -2314,52 +2315,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "A(z) '%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztÅ‘ id)" @@ -2433,12 +2434,12 @@ msgstr "" " %s\n" "címkéjű lemezt a(z) %s meghajtóba és üss entert\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) '%s' csomagrendszer nem támogatott" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "A megfelelÅ‘ csomagrendszer típusa nem határozható meg" @@ -2563,7 +2564,7 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor" msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelÅ‘" @@ -2576,7 +2577,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2585,14 +2586,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mezÅ‘ a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "A méret nem megfelelÅ‘" diff --git a/po/it.po b/po/it.po index cb0f28ec7..59a78c681 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-10-05 17:38+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -147,7 +147,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" @@ -634,7 +634,7 @@ msgstr "Impossibile rinominare %s in %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" @@ -798,11 +798,11 @@ msgstr "I pacchetti devono essere rimossi ma il remove msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non è terminato" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non può essere letta." @@ -833,7 +833,7 @@ msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero su %s" @@ -872,7 +872,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" @@ -881,7 +881,7 @@ msgstr "Impossibile ottenere %s %s\n" msgid "Some files failed to download" msgstr "Il download di alcuni file è fallito" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Download completato e in modalità download-only" @@ -981,15 +981,15 @@ msgstr "Non msgid "Selected version %s (%s) for %s\n" msgstr "Versione selezionata %s (%s) per %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -997,26 +997,26 @@ msgstr "" "Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " "si useranno quelli precedenti." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, si sta selezionando %s per la regex '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "È consigliabile eseguire 'apt-get -f install' per correggere questi problemi:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1024,7 +1024,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1036,7 +1036,7 @@ msgstr "" "si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n" "richiesti non sono ancora stati creati o rimossi da incoming." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1046,116 +1046,116 @@ msgstr "" "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Pacchetto non integro" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Fallito" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, problem resolver ha rotto qualcosa" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non è sufficente" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario prendere %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Non è stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Si è saltata l'estrazione del sorgente già estratto in %s\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare se il pacchetto 'dpkg-dev' è installato.\n" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" "Bisogna specificare almeno un pacchetto di cui controllare la generazione di " "dipendenze" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1164,7 +1164,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché non si trova il " "pacchetto %s" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1173,32 +1173,32 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perché nessuna versione " "del pacchetto %s può soddisfare le richieste di versione" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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 nuovo" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s è fallita" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non è stato possibile soddisfare le dipendenze di costruzione per %s." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione è fallito" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1460,7 +1460,7 @@ msgstr "File di configurazione duplice %s/%s" msgid "Failed to write file %s" msgstr "Impossibile scrivere il file %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Chiusura del file %s fallita" @@ -1514,7 +1514,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" @@ -2329,52 +2330,52 @@ msgstr "Impossibile analizzare il file dei pacchetti %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file dei pacchetti %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La linea %lu in %s (URI) non è corretta" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La linea %lu in %s (dist) non è corretta" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La linea %lu in %s (URI parse) non è corretta" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non è corretta" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La linea %lu in %s (dist parse) non è corretta" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Apertura di %s in corso" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linea %u troppo lunga nel source list %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La linea %u in %s (type) non è corretta" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Il tipo '%s' non è riconosciuto alla linea %u nella lista sorgente %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La linea %u in %s (vendor id) non è corretta" @@ -2447,12 +2448,12 @@ msgstr "" "Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere " "invio." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di archiviazione (packaging) '%s' non è supportato" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" @@ -2578,7 +2579,7 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente" msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" @@ -2592,7 +2593,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2601,7 +2602,7 @@ msgstr "" "Non è stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2609,7 +2610,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c'è un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" diff --git a/po/ja.po b/po/ja.po index 2632266ea..a7083728c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-09 12:54+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ¥³¥ó¥Ñ¥¤¥ëÆü»þ: %s %s\n" @@ -638,7 +638,7 @@ msgstr "%s msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Àµµ¬É½¸½¤ÎŸ³«¥¨¥é¡¼ - %s" @@ -803,11 +803,11 @@ msgstr " msgid "Internal error, Ordering didn't finish" msgstr "ÆâÉô¥¨¥é¡¼¡¢diversion ¤ÎÄɲÃ" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "¥À¥¦¥ó¥í¡¼¥É¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "¥½¡¼¥¹¤Î¥ê¥¹¥È¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£" @@ -836,7 +836,7 @@ msgstr "Ÿ msgid "After unpacking %sB disk space will be freed.\n" msgstr "Ÿ³«¸å¤Ë %sB ¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬²òÊü¤µ¤ì¤Þ¤¹¡£\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó" @@ -873,7 +873,7 @@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "³¹Ô¤·¤Þ¤¹¤« [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s ¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ %s\n" @@ -882,7 +882,7 @@ msgstr "%s msgid "Some files failed to download" msgstr "¤¤¤¯¤Ä¤«¤Î¥Õ¥¡¥¤¥ë¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "¥À¥¦¥ó¥í¡¼¥É¥ª¥ó¥ê¡¼¥â¡¼¥É¤Ç¥Ñ¥Ã¥±¡¼¥¸¤Î¥À¥¦¥ó¥í¡¼¥É¤¬´°Î»¤·¤Þ¤·¤¿" @@ -981,15 +981,15 @@ msgstr "'%2$s' msgid "Selected version %s (%s) for %s\n" msgstr "%3$s ¤Ë¤Ï¥Ð¡¼¥¸¥ç¥ó %1$s (%2$s) ¤òÁªÂò¤·¤Þ¤·¤¿\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "update ¥³¥Þ¥ó¥É¤Ï°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "list ¥Ç¥£¥ì¥¯¥È¥ê¤ò¥í¥Ã¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -997,27 +997,27 @@ msgstr "" "¤¤¤¯¤Ä¤«¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Î¥À¥¦¥ó¥í¡¼¥É¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£Ìµ»ë¤µ¤ì¤¿¤«¡¢¤¢" "¤ë¤¤¤Ï¸Å¤¤¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤·¤¿¡£" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ãí°Õ: Àµµ¬É½¸½ '%2$s' ¤ËÂФ·¤Æ %1$s ¤òÁªÂò¤·¤Þ¤·¤¿\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "°Ê²¼¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë 'apt-get -f install' ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì" "¤Þ¤»¤ó:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1025,7 +1025,7 @@ msgstr "" "̤²ò·è¤Î°Í¸´Ø·¸¤Ç¤¹¡£'apt-get -f install' ¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤(¤Þ¤¿¤Ï²òË¡" "¤òÌÀ¼¨¤·¤Æ¤¯¤À¤µ¤¤)¡£" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1037,7 +1037,7 @@ msgstr "" "Incoming ¤«¤é°ÜÆ°¤µ¤ì¤Æ¤¤¤Ê¤¤¡¢ÉÔ°ÂÄêÈǥǥ£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ò»ÈÍѤ·\n" "¤Æ¤¤¤ë¤â¤Î¤È¹Í¤¨¤é¤ì¤Þ¤¹¡£" -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1047,117 +1047,117 @@ msgstr "" "²ÄǽÀ­¤¬¹â¤¤¤Ç¤¹¡£¤½¤Î¤¿¤á¡¢¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ø¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤òÁ÷¤Ã¤Æ¤¯¤À\n" "¤µ¤¤¡£" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "°Ê²¼¤Î¾ðÊ󤬤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤ËÌòΩ¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "²õ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "°Ê²¼¤ÎÆÃÊ̥ѥ屡¼¥¸¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Äó°Æ¥Ñ¥Ã¥±¡¼¥¸:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "¿ä¾©¥Ñ¥Ã¥±¡¼¥¸:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É¥Ñ¥Ã¥±¡¼¥¸¤ò¸¡½Ð¤·¤Æ¤¤¤Þ¤¹... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "¼ºÇÔ" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "´°Î»" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "ÆâÉô¥¨¥é¡¼¡¢AllUpgrade ¤¬²¿¤«¤òÇ˲õ¤·¤Þ¤·¤¿" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" "¥½¡¼¥¹¤ò¼èÆÀ¤¹¤ë¤Ë¤Ï¾¯¤Ê¤¯¤È¤â¤Ò¤È¤Ä¤Î¥Ñ¥Ã¥±¡¼¥¸Ì¾¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "%s ¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "%s ¤Ë½¼Ê¬¤Ê¶õ¤­¥¹¥Ú¡¼¥¹¤¬¤¢¤ê¤Þ¤»¤ó" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB Ãæ %1$sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB ¤Î¥½¡¼¥¹¥¢¡¼¥«¥¤¥Ö¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "¥½¡¼¥¹ %s ¤ò¼èÆÀ\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "¤¤¤¯¤Ä¤«¤Î¥¢¡¼¥«¥¤¥Ö¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£" -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "¤¹¤Ç¤Ë %s ¤ËŸ³«¤µ¤ì¤¿¥½¡¼¥¹¤¬¤¢¤ë¤¿¤á¡¢Å¸³«¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ÿ³«¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "¥Ó¥ë¥É¥³¥Þ¥ó¥É '%s' ¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "»Ò¥×¥í¥»¥¹¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" "builddeps ¤ò¥Á¥§¥Ã¥¯¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤ò¾¯¤Ê¤¯¤È¤â 1 ¤Ä»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s ¤Î build-dependency ¾ðÊó¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s ¤Ë¤Ï build depends ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1166,7 +1166,7 @@ msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %3$s ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂФ¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È" "¤¬¤Ç¤­¤Þ¤»¤ó" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1175,32 +1175,32 @@ msgstr "" "Æþ¼ê²Äǽ¤Ê %3$s ¤Ï¤¤¤º¤ì¤â¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æ¤ÎÍ×µá¤òËþ¤¿¤»¤Ê¤¤¤¿¤á¡¢%2$s ¤ËÂÐ" "¤¹¤ë %1$s ¤Î°Í¸´Ø·¸¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s ¤Î°Í¸´Ø·¸ %1$s ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %3$s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s ¤Î Build-dependency ¤òËþ¤¿¤¹¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£" -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "build dependency ¤Î½èÍý¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1455,7 +1455,7 @@ msgstr " msgid "Failed to write file %s" msgstr "%s ¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "%s ¤Î¥¯¥í¡¼¥º¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" @@ -1509,7 +1509,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "¥Õ¥¡¥¤¥ë %s/%s ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¤â¤Î¤ò¾å½ñ¤­¤·¤Þ¤¹" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s ¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" @@ -2315,52 +2316,52 @@ msgstr " msgid "Unable to parse package file %s (2)" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë %s ¤ò²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (URI parse)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (absolute dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$lu ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s ¤ò¥ª¡¼¥×¥ó¤·¤Æ¤¤¤Þ¤¹" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬Ä¹²á¤®¤Þ¤¹¡£" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "¥½¡¼¥¹¥ê¥¹¥È %3$s ¤Î %2$u ¹Ô¤Ë¤¢¤ë¥¿¥¤¥× '%1$s' ¤ÏÉÔÌÀ¤Ç¤¹" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "¥½¡¼¥¹¥ê¥¹¥È %2$s ¤Î %1$u ¹ÔÌܤ¬ÉÔÀµ¤Ç¤¹ (vendor id)" @@ -2434,12 +2435,12 @@ msgstr "" " '%s'\n" "¤È¥é¥Ù¥ë¤ÎÉÕ¤¤¤¿¥Ç¥£¥¹¥¯¤ò¥É¥é¥¤¥Ö '%s' ¤ËÆþ¤ì¤Æ enter ¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¥·¥¹¥Æ¥à '%s' ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "ŬÀڤʥѥ屡¼¥¸¥·¥¹¥Æ¥à¥¿¥¤¥×¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó" @@ -2563,7 +2564,7 @@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "¥ê¥Í¡¼¥à¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum ¤¬Å¬¹ç¤·¤Þ¤»¤ó" @@ -2576,7 +2577,7 @@ msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°" "¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹ (¸ºß¤·¤Ê¤¤¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¤¿¤á)¡£" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2585,7 +2586,7 @@ msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°" "¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2593,7 +2594,7 @@ msgstr "" "¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë Filename: " "¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "¥µ¥¤¥º¤¬Å¬¹ç¤·¤Þ¤»¤ó" diff --git a/po/ko.po b/po/ko.po index 38029aae1..9089557f1 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -145,7 +145,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s), ì»´íŒŒì¼ ì‹œê° %s %s\n" @@ -635,7 +635,7 @@ msgstr "%s 파ì¼ì˜ ì´ë¦„ì„ %s(으)ë¡œ 바꾸는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "ì •ê·œì‹ ì»´íŒŒì¼ ì˜¤ë¥˜ - %s" @@ -799,11 +799,11 @@ msgstr "꾸러미를 지워야 하지만 지우기가 금지ë˜ì–´ 있습니다. msgid "Internal error, Ordering didn't finish" msgstr "diversionì„ ì¶”ê°€í•˜ëŠ” ë° ë‚´ë¶€ 오류" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "소스 목ë¡ì„ ì½ì„ 수 없습니다." @@ -832,7 +832,7 @@ msgstr "ì••ì¶•ì„ í’€ë©´ %së°”ì´íŠ¸ì˜ ë””ìŠ¤í¬ ê³µê°„ì„ ë” ì‚¬ìš©í•˜ê²Œ ë© msgid "After unpacking %sB disk space will be freed.\n" msgstr "ì••ì¶•ì„ í’€ë©´ %së°”ì´íŠ¸ì˜ ë””ìŠ¤í¬ ê³µê°„ì´ ë¹„ì›Œì§‘ë‹ˆë‹¤.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "%sì— ì¶©ë¶„í•œ ê³µê°„ì´ ì—†ìŠµë‹ˆë‹¤" @@ -872,7 +872,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "ê³„ì† í•˜ì‹œê² ìŠµë‹ˆê¹Œ [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ %s\n" @@ -881,7 +881,7 @@ msgstr "%s 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ %s\n" msgid "Some files failed to download" msgstr "ì¼ë¶€ 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 ì „ìš© 모드입니다" @@ -979,15 +979,15 @@ msgstr "%2$s ê¾¸ëŸ¬ë¯¸ì˜ '%1$s' ë²„ì „ì„ ì°¾ì„ ìˆ˜ 없습니다" msgid "Selected version %s (%s) for %s\n" msgstr "%3$s ê¾¸ëŸ¬ë¯¸ì˜ %1$s (%2$s) ë²„ì „ì„ ì„ íƒí•©ë‹ˆë‹¤\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "update ëª…ë ¹ì€ ì¸ìˆ˜ë¥¼ 받지 않습니다" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "ëª©ë¡ ë””ë ‰í† ë¦¬ë¥¼ 잠글 수 없습니다" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -995,26 +995,26 @@ msgstr "" "ì¼ë¶€ ì¸ë±ìŠ¤ 파ì¼ì„ 내려받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. 해당 파ì¼ì„ 무시하거나 ê³¼ê±°ì˜ ë²„" "ì „ì„ ëŒ€ì‹  사용합니다." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgradeë•Œë¬¸ì— ë§ê°€ì¡ŒìŠµë‹ˆë‹¤" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "%s 꾸러미를 ì°¾ì„ ìˆ˜ 없습니다" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주ì˜, ì •ê·œì‹ '%2$s'ì— ëŒ€í•˜ì—¬ %1$sì„(를) ì„ íƒí•©ë‹ˆë‹¤\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다ìŒì„ 바로잡으려면 `apt-get -f install'ì„ ì‹¤í–‰í•´ 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1022,7 +1022,7 @@ msgstr "" "ì˜ì¡´ì„±ì´ 맞지 않습니다. 꾸러미 ì—†ì´ 'apt-get -f install'ì„ ì‹œë„í•´ 보십시오 " "(아니면 í•´ê²° ë°©ë²•ì„ ì§€ì •í•˜ì‹­ì‹œì˜¤)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1033,7 +1033,7 @@ msgstr "" "불안정 ë°°í¬íŒì„ 사용해서 ì¼ë¶€ 필요한 꾸러미를 ì•„ì§ ë§Œë“¤ì§€ 않았거나,\n" "ì•„ì§ Incomingì—ì„œ 나오지 ì•Šì€ ê²½ìš°ì¼ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1042,115 +1042,115 @@ msgstr "" "í•œ 가지 ìž‘ì—…ë§Œì„ ìš”ì²­í•˜ì…¨ìœ¼ë¯€ë¡œ, ì•„ë§ˆë„ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ 설치할 수\n" "없는 ê²½ìš°ì¼ ê²ƒì´ê³  ì´ ê¾¸ëŸ¬ë¯¸ì— ë²„ê·¸ 보고서를 제출해야 합니다." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "ì´ ìƒí™©ì„ 해결하는 ë° ë‹¤ìŒ ì •ë³´ê°€ ë„ì›€ì´ ë  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "ë§ê°€ì§„ 꾸러미" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "ë‹¤ìŒ ê¾¸ëŸ¬ë¯¸ë¥¼ ë” ì„¤ì¹˜í•  것입니다:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "업그레ì´ë“œë¥¼ 계산하는 중입니다... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, AllUpgradeë•Œë¬¸ì— ë§ê°€ì¡ŒìŠµë‹ˆë‹¤" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "해당ë˜ëŠ” 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "%sì˜ ì†ŒìŠ¤ 꾸러미를 ì°¾ì„ ìˆ˜ 없습니다" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "%sì— ì¶©ë¶„í•œ ê³µê°„ì´ ì—†ìŠµë‹ˆë‹¤" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 ì•„ì¹´ì´ë¸Œë¥¼ %së°”ì´íŠ¸/%së°”ì´íŠ¸ 받아야 합니다.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 ì•„ì¹´ì´ë¸Œë¥¼ %së°”ì´íŠ¸ 받아야 합니다.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "ì¼ë¶€ ì•„ì¹´ì´ë¸Œë¥¼ 가져오는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%sì— ì´ë¯¸ 풀려 있는 ì†ŒìŠ¤ì˜ ì••ì¶•ì„ í’€ì§€ ì•Šê³  건너 ëœë‹ˆë‹¤.\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "해당ë˜ëŠ” 빌드 ì˜ì¡´ì„±ì„ 검사할 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%sì˜ ë¹Œë“œ ì˜ì¡´ì„± 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s ê¾¸ëŸ¬ë¯¸ì— ë¹Œë“œ ì˜ì¡´ì„±ì´ 없습니다.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1159,7 +1159,7 @@ msgstr "" "%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s 꾸러미를 ì°¾ì„ ìˆ˜ 없습니" "다" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1168,32 +1168,32 @@ msgstr "" "%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s ê¾¸ëŸ¬ë¯¸ì˜ ì‚¬ìš© 가능한 버" "ì „ 중ì—서는 ì´ ë²„ì „ ìš”êµ¬ì‚¬í•­ì„ ë§Œì¡±ì‹œí‚¬ 수 없습니다" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시키는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: %3$s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%sì˜ ë¹Œë“œ ì˜ì¡´ì„±ì„ 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "빌드 ì˜ì¡´ì„±ì„ 처리하는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "지ì›í•˜ëŠ” 모듈:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1446,7 +1446,7 @@ msgstr "%s/%s 설정 파ì¼ì´ 중복ë˜ì—ˆìŠµë‹ˆë‹¤" msgid "Failed to write file %s" msgstr "%s 파ì¼ì„ 쓰는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "%s 파ì¼ì„ 닫는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" @@ -1499,7 +1499,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s 파ì¼ì€ %s ê¾¸ëŸ¬ë¯¸ì— ìžˆëŠ” 파ì¼ì„ ë®ì–´ ì”니다" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%sì„(를) ì½ì„ 수 없습니다" @@ -2303,52 +2304,52 @@ msgstr "꾸러미 íŒŒì¼ %s 파ì¼ì„ 파싱할 수 없습니다 (1)" msgid "Unable to parse package file %s (2)" msgstr "꾸러미 íŒŒì¼ %s 파ì¼ì„ 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (URI 파싱)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (절대 dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (dist 파싱)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s 파ì¼ì„ 여는 중입니다" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (타입)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "소스 리스트 %3$sì˜ %2$u번 ì¤„ì˜ '%1$s' íƒ€ìž…ì„ ì•Œ 수 없습니다" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (ë²¤ë” ID)" @@ -2421,12 +2422,12 @@ msgstr "" "디스í¬ë¥¼ 넣고 enter를 누르십시오\n" " '%1$s'\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "꾸러미 시스템 '%s'ì„(를) 지ì›í•˜ì§€ 않습니다" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "올바른 꾸러미 시스템 íƒ€ìž…ì„ ì•Œì•„ë‚¼ 수 없습니다" @@ -2544,7 +2545,7 @@ msgstr "소스 ìºì‹œë¥¼ 저장하는 ë° ìž…ì¶œë ¥ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤ msgid "rename failed, %s (%s -> %s)." msgstr "ì´ë¦„ 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sumì´ ë§žì§€ 않습니다" @@ -2557,7 +2558,7 @@ msgstr "" "%s ê¾¸ëŸ¬ë¯¸ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ ê³ ì³ì•¼ í•  ìˆ˜ë„ ìžˆìŠµ" "니다. (아키í…ì³ê°€ 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2566,14 +2567,14 @@ msgstr "" "%s ê¾¸ëŸ¬ë¯¸ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ ê³ ì³ì•¼ í•  ìˆ˜ë„ ìžˆìŠµ" "니다." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 ì¸ë±ìŠ¤ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤. %s ê¾¸ëŸ¬ë¯¸ì— Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "í¬ê¸°ê°€ 맞지 않습니다" diff --git a/po/nb.po b/po/nb.po index cad2d40c4..177633cc6 100644 --- a/po/nb.po +++ b/po/nb.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -162,7 +162,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert på %s %s\n" @@ -653,7 +653,7 @@ msgstr "Klarte ikke msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulært uttrykk - %s" @@ -816,11 +816,11 @@ msgstr "Pakker trenges msgid "Internal error, Ordering didn't finish" msgstr "Det oppsto en intern feil når avledningen ble lagt til" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Klarer ikke å låse nedlastingsmappa" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." @@ -849,7 +849,7 @@ msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikke nok ledig plass i %s" @@ -887,7 +887,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke å skaffe %s %s\n" @@ -896,7 +896,7 @@ msgstr "Klarte ikke msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Nedlasting fullført med innstillinga «bare nedlasting»" @@ -994,15 +994,15 @@ msgstr "Versjon msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kan ikke låse listemappa" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1010,25 +1010,25 @@ msgstr "" "Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle " "ble brukt isteden. " -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke å finne pakken %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulære uttrykket «%s»\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 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:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1036,7 +1036,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller " "angi en løsning)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1048,7 +1048,7 @@ msgstr "" "at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n" "distribusjonen." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1058,122 +1058,122 @@ msgstr "" "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en " "feilmelding." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Følgende informasjon kan være til hjelp med å løse problemet:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Ødelagte pakker" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Følgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Foreslåtte pakker:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Utført" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil - «AllUpgrade» ødela noe" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke å finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Klarte ikke å skaffe alle arkivene." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen «%s» mislyktes.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, 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:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1182,32 +1182,32 @@ 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:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Klarte ikke å behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Støttede moduler:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1462,7 +1462,7 @@ msgstr "Dobbel oppsettsfil %s/%s" msgid "Failed to write file %s" msgstr "Klarte ikke å skrive fila %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikke å lukke fila %s" @@ -1515,7 +1515,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke å lese %s" @@ -2324,52 +2325,52 @@ msgstr "Klarer ikke msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke å fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil på linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil på linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Åpner %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil på %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen «%s» er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil på %u i kildelista %s (selgers id)" @@ -2442,12 +2443,12 @@ msgstr "" " «%s»\n" "i «%s» og trykk «Enter»\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» støttes ikke" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" @@ -2567,7 +2568,7 @@ msgstr "IO-feil ved lagring av kildekode-lager" msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke å endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" @@ -2580,7 +2581,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2589,13 +2590,13 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, 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/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Feil størrelse" diff --git a/po/nl.po b/po/nl.po index c5cb71693..ba3334d41 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s voor %s %s gecompileerd op %s %s\n" @@ -643,7 +643,7 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -807,11 +807,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." msgid "Internal error, Ordering didn't finish" msgstr "Interne fout bij het toevoegen van een omleiding" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." @@ -840,7 +840,7 @@ msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" @@ -877,7 +877,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" @@ -886,7 +886,7 @@ msgstr "Ophalen van %s %s is mislukt\n" msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" @@ -986,15 +986,15 @@ msgstr "Versie '%s' voor '%s' is niet gevonden" msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1002,27 +1002,27 @@ msgstr "" "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " "zijn oudere versies van gebruikt." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 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:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1030,7 +1030,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)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1041,7 +1041,7 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1051,119 +1051,119 @@ msgstr "" "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald " "moetworden" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1172,7 +1172,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1181,32 +1181,32 @@ 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:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1470,7 +1470,7 @@ msgstr "Dubbel configuratiebestand %s/%s" msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" @@ -1523,7 +1523,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" @@ -2342,52 +2343,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Type '%s' is onbekend op regel %u in bronlijst %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" @@ -2462,12 +2463,12 @@ msgstr "" " '%s'\n" "in het station '%s' te plaatsen en op 'enter' te drukken\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" @@ -2591,7 +2592,7 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" @@ -2604,7 +2605,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2613,7 +2614,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2621,7 +2622,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Grootte komt niet overeen" diff --git a/po/nn.po b/po/nn.po index 16e47203b..04bda23d4 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: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Håvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert på %s %s\n" @@ -637,7 +637,7 @@ msgstr "Klarte ikkje endra namnet p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -801,11 +801,11 @@ msgstr "Nokre pakkar m msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Klarte ikkje låsa nedlastingskatalogen" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." @@ -834,7 +834,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" @@ -872,7 +872,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -881,7 +881,7 @@ msgstr "Klarte ikkje henta %s %s\n" msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" @@ -980,15 +980,15 @@ msgstr "Fann ikkje versjonen msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Klarte ikkje låsa listekatalogen" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -996,26 +996,26 @@ msgstr "" "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " "filer er brukte i staden." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex «%s»\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»." -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1023,7 +1023,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja " "ei løysing)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1035,7 +1035,7 @@ msgstr "" "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i «Incoming»." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1045,122 +1045,122 @@ msgstr "" "pakken rett og slett ikkje lèt seg installera. I såfall bør du senda\n" "feilmelding." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Øydelagde pakkar" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Dei følgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Føreslåtte pakkar:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Tilrådde pakkar" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade øydelagde noko" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Må henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen «%s» mislukkast.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen «%s» mislukkast.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, 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:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1169,31 +1169,31 @@ 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:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Støtta modular:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1446,7 +1446,7 @@ msgstr "Dobbel oppsettsfil %s/%s" msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" @@ -1499,7 +1499,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" @@ -2307,52 +2308,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" @@ -2426,12 +2427,12 @@ msgstr "" " «%s»\n" "i stasjonen «%s» og trykk Enter.\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet «%s» er ikkje støtta" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" @@ -2550,7 +2551,7 @@ msgstr "IU-feil ved lagring av kjeldelager" msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" @@ -2563,7 +2564,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2571,14 +2572,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, 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/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Feil storleik" diff --git a/po/pl.po b/po/pl.po index 936c6e99c..db724a2ac 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" @@ -640,7 +640,7 @@ msgstr "Nie uda msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "B³±d kompilacji wyra¿enia regularnego - %s" @@ -803,11 +803,11 @@ msgstr "Pakiety powinny zosta msgid "Internal error, Ordering didn't finish" msgstr "B³±d wewnêtrzny przy dodawaniu objazdu" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Nie uda³o siê zablokowaæ katalogu pobierania" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nie uda³o siê odczytaæ list ¼róde³." @@ -836,7 +836,7 @@ msgstr "Po rozpakowaniu zostanie dodatkowo u msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca" @@ -873,7 +873,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowaæ [T/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie uda³o siê pobraæ %s %s\n" @@ -882,7 +882,7 @@ msgstr "Nie uda msgid "Some files failed to download" msgstr "Nie uda³o siê pobraæ niektórych plików" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Ukoñczono pobieranie w trybie samego pobierania" @@ -981,15 +981,15 @@ msgstr "Wersja '%s' dla '%s' nie zosta msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersjê %s (%s) dla %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga ¿adnych argumentów" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nie uda³o siê zablokowaæ katalogu list" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -997,25 +997,25 @@ msgstr "" "Nie uda³o siê pobraæ niektórych plików indeksu, zosta³y one zignorowane lub " "zosta³a u¿yta ich starsza wersja." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Nie uda³o siê odnale¼æ pakietu %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyra¿enie '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Nale¿y uruchomiæ `apt-get -f install', aby je naprawiæ:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1023,7 +1023,7 @@ msgstr "" "Niespe³nione zale¿no¶ci. Spróbuj 'apt-get -f install' bez pakietów (lub " "podaj rozwi±zanie)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1035,7 +1035,7 @@ msgstr "" "niestabilnej, w której niektóre pakiety nie zosta³y jeszcze utworzone\n" "lub przeniesione z katalogu Incoming (\"Przychodz±ce\")." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1045,120 +1045,120 @@ msgstr "" "danego pakietu po prostu nie da siê zainstalowaæ i nale¿y zg³osiæ w nim\n" "b³±d." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Nastêpuj±ce informacje mog± pomóc rozpoznaæ sytuacjê:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Pakiety s± b³êdne" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Zostan± zainstalowane nastêpuj±ce dodatkowe pakiety:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Nie uda³o siê" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "B³±d wewnêtrzny, AllUpgrade wszystko popsu³o" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, 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:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczaj±cej ilo¶ci wolnego miejsca" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów ¼róde³.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów ¼róde³.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz ¼ród³o %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Nie uda³o siê pobraæ niektórych archiwów." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiod³o.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiod³o.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Proces potomny zawiód³" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" "Nale¿y podaæ przynajmniej jeden pakiet, dla którego maj± zostaæ pakiety " "wymagane do budowania" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie uda³o siê pobraæ informacji o zale¿no¶ciach na czas budowania dla %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zale¿no¶ci czasu budowania.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1167,7 +1167,7 @@ msgstr "" "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1176,32 +1176,32 @@ msgstr "" "Zale¿no¶æ %s od %s nie mo¿e zostaæ spe³niona, poniewa¿ ¿adna z dostêpnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie uda³o siê spe³niæ zale¿no¶ci na czas budowania od %s." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Nie uda³o siê przetworzyæ zale¿no¶ci na czas budowania" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Obs³ugiwane modu³y:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1458,7 +1458,7 @@ msgstr "Zduplikowany plik konfiguracyjny %s/%s" msgid "Failed to write file %s" msgstr "Nie uda³o siê zapisaæ pliku %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Nie uda³o siê zamkn±æ pliku %s" @@ -1511,7 +1511,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nie mo¿na czytaæ %s" @@ -2318,52 +2319,52 @@ msgstr "Nie uda msgid "Unable to parse package file %s (2)" msgstr "Nie uda³o siê zanalizowaæ pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, 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:89 +#: apt-pkg/sourcelist.cc:96 #, 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:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, 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:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ '%s' jest nieznany - linia %u listy ¼róde³ %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Nieprawid³owa linia %u w li¶cie ¼róde³ %s (identyfikator producenta)" @@ -2437,12 +2438,12 @@ msgstr "" " '%s'\n" "do napêdu '%s' i nacisn±æ enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietów '%s' nie jest obs³ugiwany" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nie uda³o siê okre¶liæ odpowiedniego typu systemu pakietów" @@ -2565,7 +2566,7 @@ msgstr "B msgid "rename failed, %s (%s -> %s)." msgstr "nie uda³o siê zmieniæ nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "B³êdna suma MD5" @@ -2578,7 +2579,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2587,14 +2588,14 @@ msgstr "" "Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba " "bêdzie rêcznie naprawiæ ten pakiet." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, 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/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "B³êdny rozmiar" diff --git a/po/pt.po b/po/pt.po index 68a6d730a..78f5556fb 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -635,7 +635,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -799,11 +799,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno ao adicionar um desvio" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@ -833,7 +833,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Desculpe, você não tem espaço suficiente em %s" @@ -870,7 +870,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" @@ -879,7 +879,7 @@ msgstr "Falha ao obter %s %s\n" msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" @@ -978,15 +978,15 @@ msgstr "Versão '%s' para '%s' não foi encontrada" msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no directório de listas" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -994,25 +994,25 @@ msgstr "" "Falhou o download de alguns ficheiros de índice, foram ignorados ou os " "antigos foram usados em seu lugar." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para a expressão regular '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1020,7 +1020,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1032,7 +1032,7 @@ msgstr "" "distribuição instável, que alguns pacotes requesitados ainda não foram \n" "criados ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1043,119 +1043,119 @@ msgstr "" "de\n" "bug sobre esse pacote." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" "Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1164,7 +1164,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1173,32 +1173,32 @@ 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 requesitos de versão" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, 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:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1456,7 +1456,7 @@ msgstr "Arquivo de configuração duplicado %s/%s" msgid "Failed to write file %s" msgstr "Falha ao escrever ficheiro %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Falha ao fechar ficheiro %s" @@ -1509,7 +1509,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@ -2316,52 +2317,52 @@ msgstr "Impossível o parse ao ficheiro de pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossível o parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu na lista de fontes %s (Distribuição absoluta)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in 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:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@ -2436,12 +2437,12 @@ msgstr "" " '%s'\n" "na drive '%s' e pressione enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável" @@ -2567,7 +2568,7 @@ msgstr "Erro de I/O ao gravar a cache de código fonte" msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" @@ -2581,7 +2582,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2590,7 +2591,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2598,7 +2599,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Tamanho incorreto" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6f28b8a77..7706fb6fa 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: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -637,7 +637,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -800,11 +800,11 @@ msgstr "Pacotes precisam ser removidos mas a remo msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno ao adicionar um desvio" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no diretório de download" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@ -834,7 +834,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Desculpe, você não tem espaço suficiente em %s" @@ -871,7 +871,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n] ? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao baixar %s %s\n" @@ -880,7 +880,7 @@ msgstr "Falha ao baixar %s %s\n" msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" @@ -979,15 +979,15 @@ msgstr "Vers msgid "Selected version %s (%s) for %s\n" msgstr "Versão selecionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no diretório de listas" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -995,25 +995,25 @@ msgstr "" "Alguns arquivos de índice falharam no download, eles foram ignorados ou os " "antigos foram usados em seu lugar." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer rodar `apt-get -f install' para corrigir isso:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1021,7 +1021,7 @@ msgstr "" "Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1033,7 +1033,7 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram \n" "criados ainda ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1043,117 +1043,117 @@ msgstr "" "esteja simplesmente não instalável e um relato de erro sobre esse\n" "pacotes deve ser enviado." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Calculando Atualização... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se baixe o fonte" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso pegar %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Obter Fonte %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Falha ao fazer o download de alguns arquivos." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando desempacotamento de pacote fonte já desempacotado em %s\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1162,7 +1162,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1171,32 +1171,32 @@ 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:2286 +#: cmdline/apt-get.cc:2282 #, 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: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependência %s para %s: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, 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:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de construção" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1453,7 +1453,7 @@ msgstr "Arquivo de confgiura msgid "Failed to write file %s" msgstr "Falha ao gravar arquivo %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Falha ao fechar arquivo %s" @@ -1506,7 +1506,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@ -2316,52 +2317,52 @@ msgstr "Imposs msgid "Unable to parse package file %s (2)" msgstr "Impossível analizar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu no arquivo de fontes %s (Distribuição absoluta)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na sources.lits %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in 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:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@ -2436,12 +2437,12 @@ msgstr "" " '%s'\n" "no drive '%s' e pressione enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável." @@ -2567,7 +2568,7 @@ msgstr "Erro de I/O ao gravar cache fonte" msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" @@ -2581,7 +2582,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2590,7 +2591,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2598,7 +2599,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Tamanho incorreto" diff --git a/po/ro.po b/po/ro.po index 9d1e7b34c..9a0d7213e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-08-25 17:43+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pentru %s %s compilat pe %s %s\n" @@ -644,7 +644,7 @@ msgstr "EÅŸuare în a redenumi %s în %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -807,11 +807,11 @@ msgstr "Pachete trebuiesc ÅŸterse dar ÅŸtergerea este dezactivată." msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă în timpul adăugării unei diversiuni" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." @@ -840,7 +840,7 @@ msgstr "După despachetare va fi folosit %sB de spaÅ£iu suplimentar pe disc.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "După despachetare va fi eliberat %sB din spaÅ£iul de pe disc.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nu aveÅ£i suficient spaÅ£iu în %s" @@ -878,7 +878,7 @@ msgstr "RenunÅ£are." msgid "Do you want to continue [Y/n]? " msgstr "VreÅ£i să continuaÅ£i [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "EÅŸuare în aducerea %s %s\n" @@ -887,7 +887,7 @@ msgstr "EÅŸuare în aducerea %s %s\n" msgid "Some files failed to download" msgstr "EÅŸuare în descărcarea unor fiÅŸiere" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Descărcare completă ÅŸi în modul doar descărcare" @@ -984,15 +984,15 @@ msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1000,25 +1000,25 @@ msgstr "" "Unele fiÅŸiere index au eÅŸuat la descărcare, fie au fost ignorate, fie au " "fost folosite în loc unele vechi." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 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:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1026,7 +1026,7 @@ msgstr "" "DependenÅ£e neîndeplinite. ÃŽncercaÅ£i 'apt-get -f install' fără nici un pachet " "(sau oferiÅ£i o altă soluÅ£ie)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1039,7 +1039,7 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1049,117 +1049,117 @@ msgstr "" " că pachetul pur ÅŸi simplu nu este instalabil ÅŸi un raport de eroare pentru\n" "acest pachet ar trebui completat." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informaÅ£ii ar putea să vă ajute la rezolvarea situaÅ£iei:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "EÅŸuare" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu pot găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveÅ£i suficient spaÅ£iu în %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, 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" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, 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:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "EÅŸuare în a aduce unele arhive." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eÅŸuată.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eÅŸuată.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "EÅŸuare proces copil" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenÅ£e înglobate.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1168,7 +1168,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:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1177,32 +1177,32 @@ 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:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "EÅŸuare în a satisface dependenÅ£a lui %s de %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "EÅŸuare în a satisface dependenÅ£a lui %s de %s: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, 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:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "EÅŸuare în a prelucra dependenÅ£ele înglobate" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1461,7 +1461,7 @@ msgstr "FiÅŸier de configurare duplicat %s/%s" msgid "Failed to write file %s" msgstr "EÅŸuare în a scrie fiÅŸierul %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "EÅŸuare în a închide fiÅŸierul %s" @@ -1514,7 +1514,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "FiÅŸierul %s/%s suprascrie pe cel din pachetul %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nu pot citi %s" @@ -2325,52 +2326,52 @@ msgstr "Nu pot analiza fiÅŸierul pachet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nu pot analiza fiÅŸierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, 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:89 +#: apt-pkg/sourcelist.cc:96 #, 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:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, 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:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linie greÅŸită %u în lista sursă %s (identificator vânzător)" @@ -2444,12 +2445,12 @@ msgstr "" " '%s'\n" "în unitatea '%s' ÅŸi apăsaÅ£i Enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nu pot determina un tip de sistem de pachete potrivit" @@ -2575,7 +2576,7 @@ msgstr "Eroare IO în timpul salvării sursei cache" msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eÅŸuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" @@ -2588,7 +2589,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2597,7 +2598,7 @@ msgstr "" "N-am putut localiza un fiÅŸier pentru pachetul %s. Aceasta ar putea însemna " "că aveÅ£i nevoie să depanaÅ£i manual acest pachet." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2605,7 +2606,7 @@ msgstr "" "FiÅŸierele index de pachete sunt deteriorate. Fără câmpul 'nume fiÅŸier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" diff --git a/po/ru.po b/po/ru.po index ab3c56f22..ca3447a91 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-10-22 12:24+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s Ð´Ð»Ñ %s %s Ñкомпилирован %s %s\n" @@ -650,7 +650,7 @@ msgstr "Ðе удалоÑÑŒ переименовать %s в %s" msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компилÑции регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ - %s" @@ -816,11 +816,11 @@ msgstr "Пакеты необходимо удалить, но удаление msgid "Internal error, Ordering didn't finish" msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, Ordering не завершилаÑÑŒ" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Ðевозможно заблокировать каталог Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Ðе читаетÑÑ Ð¿ÐµÑ€ÐµÑ‡ÐµÐ½ÑŒ иÑточников." @@ -851,7 +851,7 @@ msgid "After unpacking %sB disk space will be freed.\n" msgstr "" "ПоÑле раÑпаковки объем занÑтого диÑкового проÑтранÑтва уменьшитÑÑ Ð½Ð° %sB.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ðе удалоÑÑŒ определить количеÑтво Ñвободного меÑта в %s" @@ -890,7 +890,7 @@ msgstr "Ðварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ðе удалоÑÑŒ загрузить %s %s\n" @@ -899,7 +899,7 @@ msgstr "Ðе удалоÑÑŒ загрузить %s %s\n" msgid "Some files failed to download" msgstr "Ðекоторые файлы не удалоÑÑŒ загрузить" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" @@ -997,15 +997,15 @@ msgstr "ВерÑÐ¸Ñ '%s' Ð´Ð»Ñ '%s' не найдена" msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана верÑÐ¸Ñ %s (%s) Ð´Ð»Ñ %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Ðевозможно заблокировать каталог Ñо ÑпиÑками пакетов" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1013,27 +1013,27 @@ msgstr "" "Ðекоторые индекÑные файлы не загрузилиÑÑŒ, они были проигнорированы или " "вмеÑто них были иÑпользованы Ñтарые верÑии" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, AllUpgrade вÑе поломал" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Ðе могу найти пакет %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулÑрное выражение %2$s приводит к выбору %1$s\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, длÑ иÑправлениÑ Ñтих ошибок вы захотите воÑпользоватьÑÑ `apt-get -" "f install':" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1041,7 +1041,7 @@ msgstr "" "Ðеудовлетворённые завиÑимоÑти. ПопытайтеÑÑŒ выполнить 'apt-get -f install', " "не ÑƒÐºÐ°Ð·Ñ‹Ð²Ð°Ñ Ð¸Ð¼ÐµÐ½Ð¸ пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1052,7 +1052,7 @@ msgstr "" "или же иÑпользуете неÑтабильного диÑтрибутив, и запрошенные Вами пакеты\n" "ещё не Ñозданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1062,120 +1062,120 @@ msgstr "" "пакет проÑто не может быть уÑтановлен из-за ошибок в Ñамом пакете.\n" "Ðеобходимо поÑлать отчёт об Ñтой ошибке." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ поможет Вам:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Будут уÑтановлены Ñледующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "ÐаÑтойчиво рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "РаÑÑчёт обновлений... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Ðеудачно" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, решатель проблем вÑÑ‘ поломал" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ необходимо загрузить иÑходные " "текÑÑ‚Ñ‹" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Ðевозможно найти пакет Ñ Ð¸Ñходными текÑтами Ð´Ð»Ñ %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "ÐедоÑтаточно меÑта в %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ðеобходимо загрузить %sB/%sB из архивов иÑходных текÑтов.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ðужно загрузить %sB архивов Ñ Ð¸Ñходными текÑтами.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка иÑходных текÑтов %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Ðекоторые архивы не удалоÑÑŒ загрузить." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "РаÑпаковка иÑходных текÑтов пропущена, так как в %s уже находÑÑ‚ÑÑ " "раÑпакованные иÑходные текÑÑ‚Ñ‹\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда раÑпаковки '%s' завершилаÑÑŒ неудачно.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, уÑтановлен ли пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда Ñборки '%s' завершилаÑÑŒ неудачно.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Порождённый процеÑÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ завиÑимоÑтей Ð´Ð»Ñ Ñборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ðевозможно получить информацию о завиÑимоÑÑ‚ÑÑ… Ð´Ð»Ñ Ñборки %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет завиÑимоÑтей Ð´Ð»Ñ Ñборки.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1184,7 +1184,7 @@ msgstr "" "ЗавиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1193,32 +1193,32 @@ msgstr "" "ЗавиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ %s не может быть удовлетворена, поÑкольку ни одна из " "верÑий пакета %s не удовлетворÑет требованиÑм" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ðе удалоÑÑŒ удовлетворить завиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s: УÑтановленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ðевозможно удовлетворить завиÑимоÑÑ‚ÑŒ типа %s Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ЗавиÑимоÑти Ð´Ð»Ñ Ñборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Обработка завиÑимоÑтей Ð´Ð»Ñ Ñборки завершилаÑÑŒ неудачно" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1474,7 +1474,7 @@ msgstr "Повторно указанный конфигурационный Ñ„ msgid "Failed to write file %s" msgstr "Ðе удалоÑÑŒ запиÑать в файл %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Ðе удалоÑÑŒ закрыть файл %s" @@ -1527,7 +1527,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s перепиÑывает файл в пакете %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ðевозможно прочитать %s" @@ -2346,53 +2347,53 @@ msgstr "Ðевозможно прочеÑÑ‚ÑŒ Ñодержимое пакета msgid "Unable to parse package file %s (2)" msgstr "Ðевозможно прочеÑÑ‚ÑŒ Ñодержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (проблема в имени диÑтрибутива)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %lu в ÑпиÑке иÑточников %s (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в ÑпиÑке иÑточников %s Ñлишком длинна." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %u в ÑпиÑке иÑточников %s (тип)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "ÐеизвеÑтен тип '%s' в Ñтроке %u в ÑпиÑке иÑточников %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "ИÑÐºÐ°Ð¶Ñ‘Ð½Ð½Ð°Ñ Ñтрока %u в ÑпиÑке иÑточников %s (vendor id)" @@ -2462,12 +2463,12 @@ msgstr "Метод %s запуÑтилÑÑ Ð½Ðµ корректно" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Ð’Ñтавьте диÑк Ñ Ð¼ÐµÑ‚ÐºÐ¾Ð¹ '%s' в уÑтройÑтво '%s' и нажмите ввод." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Менеджер пакетов '%s' не поддерживаетÑÑ" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Ðевозможно определить подходÑщий тип менеджера пакетов" @@ -2585,7 +2586,7 @@ msgstr "Ошибка ввода/вывода при попытке Ñохран msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалоÑÑŒ, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5Sum не Ñовпадает" @@ -2598,7 +2599,7 @@ msgstr "" "Я не в ÑоÑтоÑнии обнаружить файл пакета %s. Это может означать, что Вам " "придётÑÑ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ иÑправить Ñтот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2607,13 +2608,13 @@ msgstr "" "Я не в ÑоÑтоÑнии обнаружить файл пакета %s. Это может означать, что Вам " "придётÑÑ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ иÑправить Ñтот пакет." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Ðекорректный перечень пакетов. Ðет Ð¿Ð¾Ð»Ñ Filename: Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Ðе Ñовпадает размер" diff --git a/po/sk.po b/po/sk.po index 160da405e..aba3b462a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-07-01 09:34+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pre %s %s skompilovaný na %s %s\n" @@ -634,7 +634,7 @@ msgstr "Premenovanie %s na %s zlyhalo" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@ -797,11 +797,11 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia OdstrániÅ¥ je vypnutá." msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba pri pridávaní diverzie" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Adresár pre sÅ¥ahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Nedá sa naÄítaÅ¥ zoznam zdrojov." @@ -830,7 +830,7 @@ msgstr "Po rozbalení sa na disku použije Äalších %sB.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoľní %sB.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" @@ -867,7 +867,7 @@ msgstr "PreruÅ¡ené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokraÄovaÅ¥ [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@ -876,7 +876,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n" msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuÅ¥" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "SÅ¥ahovanie ukonÄené v režime \"iba stiahnuÅ¥\"" @@ -972,15 +972,15 @@ msgstr "Nebola nájdená verzia '%s' pre '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "Zvolená verzia %s (%s) pre %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -988,25 +988,25 @@ msgstr "" "Niektoré indexové súbory sa nepodarilo stiahnuÅ¥, boli ignorované, alebo sa " "použili starÅ¡ie verzie." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsÅ¥" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Na opravu nasledovných môžete spustiÅ¥ `apt-get -f install':" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1014,7 +1014,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiÅ¥ 'apt-get -f install' bez balíkov (alebo " "navrhnite rieÅ¡enie)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1026,7 +1026,7 @@ msgstr "" "požadované balíky eÅ¡te neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1036,124 +1036,124 @@ msgstr "" "balík nie je inÅ¡talovateľný a mali by ste zaslaÅ¥ hlásenie o chybe\n" "(bug report) pre daný balík." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 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:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "PoÅ¡kodené balíky" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "NainÅ¡talujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "OdporúÄané balíky:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "PrepoÄítava sa aktualizácia... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, 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:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuÅ¥ %sB/%sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, 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:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "StiahnuÅ¥ zdroj %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získaÅ¥ závislosti pre zostavenie %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosÅ¥ pre %s sa nemôže splniÅ¥, pretože sa nedá nájsÅ¥ balík %s" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1162,31 +1162,31 @@ msgstr "" "%s závislosÅ¥ pre %s sa nedá splniÅ¥, protože sa nedá nájsÅ¥ verzia balíku %s, " "ktorá zodpovedá požiadavke na verziu" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniÅ¥." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1439,7 +1439,7 @@ msgstr "Duplicitný konfiguraÄný súbor %s/%s" msgid "Failed to write file %s" msgstr "Zápis do súboru %s zlyhal" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" @@ -1492,7 +1492,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s sa nedá ÄítaÅ¥" @@ -2299,52 +2300,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)" @@ -2416,12 +2417,12 @@ msgstr "" " '%s'\n" "do mechaniky '%s' a stlaÄte Enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "BalíÄkovací systém '%s' nie je podporovaný" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa urÄiÅ¥ vhodný typ balíÄkovacieho systému" @@ -2541,7 +2542,7 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súÄtov" @@ -2554,7 +2555,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2563,13 +2564,13 @@ msgstr "" "Nedá sa nájsÅ¥ súbor s balíkom %s. Asi budete musieÅ¥ opraviÅ¥ tento balík " "manuálne." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, 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/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" diff --git a/po/sl.po b/po/sl.po index 6e6a46613..7d8e4afb3 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: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Èuhalev \n" "Language-Team: Slovenian \n" @@ -145,7 +145,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@ -632,7 +632,7 @@ msgstr "Ni mogo msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" @@ -795,11 +795,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogo msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Ni mogoèe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoèe brati." @@ -828,7 +828,7 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po odpakiranju bo spro¹èenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" @@ -865,7 +865,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali ¾elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoèe dobiti %s %s\n" @@ -874,7 +874,7 @@ msgstr "Ni mogo msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Prenos dokonèan in uporabljen naèin samo prenos" @@ -971,15 +971,15 @@ msgstr "Razli msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razlièica %s (%s) za %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoèe zakleniti" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -987,25 +987,25 @@ msgstr "" "Nekaterih kazal ni mogoèe prenesti, zato so preklicana, ali pa so " "uporabljena starej¹a." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoèe najti paketa %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', èe ¾elite popraviti:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1013,7 +1013,7 @@ msgstr "" "Nere¹ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte re¹itev)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1024,7 +1024,7 @@ msgstr "" "nemogoè polo¾aj, èe uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi ¹e niso ustvarjeni ali prene¹eni iz Prihajajoèe." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1034,125 +1034,125 @@ msgstr "" "preprosto ne da namestiti in je potrebno vlo¾iti poroèilo o hro¹èu\n" "o tem paketu." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali re¹iti te¾avo:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo name¹èeni:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Priporoèeni paketi:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Preraèunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega ¾elite dobiti izorno kodo" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoèe najti" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoèe dobiti." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje ¾e odpakiranih izvornih paketov v %s preskoèeno\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Otro¹ki proces ni uspel" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoèe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, 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:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1161,31 +1161,31 @@ msgstr "" "%s odvisnosti za %s ni mogoèe zadostiti, ker nobena razlièica paketa %s ne " "more zadostiti zahtevi po razlièici" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoèe zadostiti." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1440,7 +1440,7 @@ msgstr "Dvojnik datoteke z nastavitvami %s/%s" msgid "Failed to write file %s" msgstr "Napaka pri pisanju datoteke %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Napaka pri zapiranju datoteke %s" @@ -1493,7 +1493,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ni mogoèe brati %s" @@ -2298,52 +2299,52 @@ msgstr "Ni mogo msgid "Unable to parse package file %s (2)" msgstr "Ni mogoèe razèleniti paketne datoteke %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Napaèna vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Napaèna vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev URI)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Napaèna vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Napaèna vrstica %lu v seznamu virov %s (razèlenitev distribucije)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Odpiram %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Napaèna vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napaèna vrstica %u v seznamu virov %s (ID ponudnika)" @@ -2416,12 +2417,12 @@ msgstr "" " '%s'\n" "v enoto '%s' in pritisnite enter\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoèe ugotoviti ustrezne vrste paketnega sistema" @@ -2539,7 +2540,7 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov" msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" @@ -2552,7 +2553,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2561,7 +2562,7 @@ msgstr "" "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2569,7 +2570,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Neujemanje velikosti" diff --git a/po/sv.po b/po/sv.po index b93c051fe..0f46a5a34 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-11-02 23:56+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s för %s %s kompilerad den %s %s\n" @@ -637,7 +637,7 @@ msgstr "Misslyckades att byta namn p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljärt uttryck - %s" @@ -798,11 +798,11 @@ msgstr "Paket m msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen." -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." @@ -833,7 +833,7 @@ msgstr "Efter uppackning kommer %sB ytterligare diskutrymme anv msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigöras på disken.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte läsa av ledigt utrymme i %s" @@ -871,7 +871,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades att hämta %s %s\n" @@ -880,7 +880,7 @@ msgstr "Misslyckades att h msgid "Some files failed to download" msgstr "Misslyckades att hämta vissa filer" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" @@ -978,15 +978,15 @@ msgstr "Version \"%s\" f msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) för %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kunde inte låsa listkatalogen" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -994,25 +994,25 @@ msgstr "" "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " "använts istället." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, väljer %s för regex \"%s\"\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan möjligen rätta detta genom att köra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1020,7 +1020,7 @@ msgstr "" "Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1032,7 +1032,7 @@ msgstr "" "distributionen, att några krävda paket ännu inte har skapats eller\n" "lagts in från \"Incoming\"." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1042,114 +1042,114 @@ msgstr "" "helt enkelt inte kan installeras och att en felrapport om detta bör\n" "skrivas." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 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:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren bröt sönder saker" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange åtminstone ett paket att hämta källkod för" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, 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:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkod %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Misslyckades att hämta vissa arkiv." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Kontrollera om paketet 'dpkg-dev' är installerat.\n" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange åtminstone ett paket att inhämta byggberoenden för" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta byggberoendeinformation för %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1157,7 +1157,7 @@ msgid "" msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1166,32 +1166,32 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s uppfyller versionskraven" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s " "är för nytt" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades att uppfylla %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte uppfyllas." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1451,7 +1451,7 @@ msgstr "Duplicerad konfigurationsfil %s/%s" msgid "Failed to write file %s" msgstr "Misslyckades att skriva filen %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades att stänga filen %s" @@ -1505,7 +1505,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunde inte läsa %s" @@ -2320,52 +2321,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har fel format (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, 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:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u för lång i källistan %s." -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, 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:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Typen \"%s\" är okänd på rad %u i källistan %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" @@ -2436,13 +2437,13 @@ msgstr "Metoden %s startade inte korrekt" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mata in disken med etiketten '%s' i enheten '%s' och tryck Enter." -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketsystemet \"%s\" stöds inte" # -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte avgöra en lämpligt paketsystemstyp" @@ -2563,7 +2564,7 @@ msgstr "In-/utfel vid lagring av k msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stämmer inte" @@ -2576,7 +2577,7 @@ msgstr "" "Jag kunde inte lokalisera 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2585,13 +2586,13 @@ msgstr "" "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är trasiga. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Storleken stämmer inte" diff --git a/po/tl.po b/po/tl.po index 58c30347d..fb3260c88 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-11-03 03:35+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@ -642,7 +642,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -807,11 +807,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." @@ -842,7 +842,7 @@ msgstr "Matapos magbuklat ay %sB na karagdagang puwang sa disk ay magagamit.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Matapos magbuklat %sB na puwang sa disk ay mapapalaya.\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" @@ -879,7 +879,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -888,7 +888,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n" msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" @@ -986,15 +986,15 @@ msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1002,26 +1002,26 @@ msgstr "" "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " "mga luma na lamang." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 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:" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1029,7 +1029,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1040,7 +1040,7 @@ 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." -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1050,115 +1050,115 @@ msgstr "" "hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "Kinakalkula ang upgrade... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 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:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, 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:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, 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:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 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:2127 +#: cmdline/apt-get.cc:2123 #, 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:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1167,7 +1167,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1176,32 +1176,32 @@ 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:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, 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:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1457,7 +1457,7 @@ msgstr "Nadobleng talaksang conf %s/%s" msgid "Failed to write file %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Bigo sa pagsara ng talaksang %s" @@ -1510,7 +1510,8 @@ 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:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" @@ -2325,52 +2326,52 @@ 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:87 +#: apt-pkg/sourcelist.cc:94 #, 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:89 +#: apt-pkg/sourcelist.cc:96 #, 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:92 +#: apt-pkg/sourcelist.cc:99 #, 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:98 +#: apt-pkg/sourcelist.cc:105 #, 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:105 +#: apt-pkg/sourcelist.cc:112 #, 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:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, 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:187 +#: apt-pkg/sourcelist.cc:240 #, 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:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "Di kilalang uri '%s' sa linyang %u sa talaksang pagkukunan %s" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" @@ -2444,12 +2445,12 @@ 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:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " @@ -2572,7 +2573,7 @@ msgstr "IO Error sa pag-imbak ng source cache" msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" @@ -2585,7 +2586,7 @@ 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:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2594,7 +2595,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2602,7 +2603,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "Di tugmang laki" diff --git a/po/zh_CN.po b/po/zh_CN.po index 606b95cb5..53558bee7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-11-15 00:05+0800\n" "Last-Translator: Tchaikov \n" "Language-Team: Debian Chinese [GB] \n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ，编译于 %s %s\n" @@ -630,7 +630,7 @@ msgstr "无法将 %s é‡å‘½å为 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达å¼æ—¶å‡ºé”™ - %s" @@ -791,11 +791,11 @@ msgstr "有软件包需è¦è¢«å¸è½½ï¼Œä½†æ˜¯å¸è½½åŠ¨ä½œè¢«ç¨‹åºè®¾ç½®æ‰€ç¦æ­¢ msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 没有完æˆ" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "无法对下载目录加é”" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "无法读å–安装æºåˆ—表。" @@ -824,7 +824,7 @@ msgstr "解压缩åŽä¼šæ¶ˆè€—掉 %sB çš„é¢å¤–空间。\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "解压缩åŽå°†ä¼šç©ºå‡º %sB 的空间。\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的空余空间" @@ -861,7 +861,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行å—？[Y/n]" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -870,7 +870,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "下载完毕，目å‰æ˜¯â€œä»…下载â€æ¨¡å¼" @@ -967,40 +967,40 @@ msgstr "未找到“%2$sâ€çš„“%1$sâ€ç‰ˆæœ¬" msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) çš„ %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr " update 命令是ä¸éœ€ä»»ä½•å‚æ•°çš„" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "无法对状æ€åˆ—表目录加é”" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" "有一些索引文件ä¸èƒ½ä¸‹è½½ï¼Œå®ƒä»¬å¯èƒ½è¢«å¿½ç•¥äº†ï¼Œä¹Ÿå¯èƒ½è½¬è€Œä½¿ç”¨äº†æ—§çš„索引文件。" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade å事了" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注æ„，根æ®æ­£åˆ™è¡¨è¾¾å¼â€œ%2$sâ€é€‰ä¸­äº† %1$s\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您å¯èƒ½éœ€è¦è¿è¡Œâ€œapt-get -f installâ€æ¥çº æ­£ä¸‹åˆ—错误：" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1008,7 +1008,7 @@ msgstr "" "有未能满足的ä¾èµ–关系。请å°è¯•ä¸æŒ‡æ˜Žè½¯ä»¶åŒ…çš„åå­—æ¥è¿è¡Œâ€œapt-get -f installâ€(也å¯" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1019,7 +1019,7 @@ msgstr "" "因为系统无法达到您è¦æ±‚的状æ€é€ æˆçš„。该版本中å¯èƒ½ä¼šæœ‰ä¸€äº›æ‚¨éœ€è¦çš„软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1028,121 +1028,121 @@ msgstr "" "您仅è¦æ±‚对å•ä¸€è½¯ä»¶åŒ…进行æ“作，这æžæœ‰å¯èƒ½æ˜¯å› ä¸ºè¯¥è½¯ä»¶åŒ…安装ä¸ä¸Šï¼ŒåŒæ—¶ï¼Œ\n" "您最好æ交一个针对这个软件包的故障报告。" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "下列的信æ¯å¯èƒ½ä¼šå¯¹è§£å†³é—®é¢˜æœ‰æ‰€å¸®åŠ©ï¼š" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "无法安装的软件包" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "将会安装下列é¢å¤–的软件包：" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "推è安装的软件包：" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "正在筹划å‡çº§... " -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "完æˆ" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，problem resolver å事了" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "è¦ä¸‹è½½æºä»£ç ï¼Œå¿…须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的æºä»£ç åŒ…" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需è¦ä¸‹è½½ %sB/%sB çš„æºä»£ç åŒ…。\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需è¦ä¸‹è½½ %sB çš„æºä»£ç åŒ…。\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "下载æºä»£ç  %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已ç»è¢«è§£åŒ…到 %s 目录的æºä»£ç åŒ…å°±ä¸å†è§£å¼€äº†\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "è¿è¡Œè§£åŒ…的命令“%sâ€å‡ºé”™ã€‚\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是å¦å®‰è£…了“dpkg-devâ€è½¯ä»¶åŒ…。\n" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%sâ€å¤±è´¥ã€‚\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "å­è¿›ç¨‹å‡ºé”™" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "è¦æ£€æŸ¥ç”Ÿæˆè½¯ä»¶åŒ…的构建ä¾èµ–关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建ä¾èµ–关系(build-dependency)ä¿¡æ¯" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建ä¾èµ–关系信æ¯ã€‚\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, 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:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1151,30 +1151,30 @@ msgstr "" "由于无法找到符åˆè¦æ±‚的软件包 %3$s çš„å¯ç”¨ç‰ˆæœ¬ï¼Œå› æ­¤ä¸èƒ½æ»¡è¶³ %2$s 所è¦æ±‚çš„ %1" "$s ä¾èµ–关系" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所è¦æ±‚ %1$s ä¾èµ–关系：%3$s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ä¸èƒ½æ»¡è¶³è½¯ä»¶åŒ… %s 所è¦æ±‚的构建ä¾èµ–关系。" -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "无法处ç†æž„建ä¾èµ–关系" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "被支æŒæ¨¡å—：" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1424,7 +1424,7 @@ msgstr "é‡å¤çš„é…置文件 %s/%s" msgid "Failed to write file %s" msgstr "无法写入文件 %s" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" @@ -1477,7 +1477,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的åŒå文件" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "æ— æ³•è¯»å– %s" @@ -2277,52 +2278,52 @@ msgstr "无法解æžè½¯ä»¶åŒ…文件 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "无法解æžè½¯ä»¶åŒ…文件 %s (2)" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行的格å¼æœ‰è¯¯ (URI)" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (dist)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (URI parse)" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (Ablolute dist)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装æºé…置文件“%2$sâ€ç¬¬ %1$lu 行有错误 (dist parse)" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "软件包æ¥æºæ¡£ %2$s 的第 %1$u 行超长了。" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在安装æºåˆ—表中 %2$s 中第 %1$u 行的格å¼æœ‰è¯¯ (type)" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "无法识别在安装æºåˆ—表 %3$s 里，第 %2$u 行中的软件包类别“%1$sâ€" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "在安装æºåˆ—表中 %2$s 中第 %1$u 行的格å¼æœ‰è¯¯ (vendor id)" @@ -2393,12 +2394,12 @@ msgstr "获å–è½¯ä»¶åŒ…çš„æ¸ é“ %s 所需的驱动程åºæ²¡æœ‰æ­£å¸¸å¯åŠ¨ã€‚" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有 “%s†的碟片æ’入驱动器“%sâ€å†æŒ‰å›žè½¦é”®ã€‚" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "ä¸æ”¯æŒâ€œ%sâ€æ‰“包系统" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适åˆçš„打包系统类型" @@ -2516,7 +2517,7 @@ msgstr "无法写入æ¥æºç¼“存文件" msgid "rename failed, %s (%s -> %s)." msgstr "无法é‡å‘½å文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5 校验和ä¸ç¬¦" @@ -2529,7 +2530,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这ç§æƒ…况下å¯èƒ½éœ€è¦æ‚¨æ‰‹åŠ¨ä¿®æ­£è¿™ä¸ªè½¯ä»¶" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2537,13 +2538,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这ç§æƒ…况下您å¯èƒ½éœ€è¦æ‰‹åŠ¨ä¿®æ­£è¿™ä¸ªè½¯ä»¶åŒ…。" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已æŸå。找ä¸åˆ°å¯¹åº”软件包 %s çš„ Filename: 字段。" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "大å°ä¸ç¬¦" diff --git a/po/zh_TW.po b/po/zh_TW.po index 53dcde63e..6b87076f6 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: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-22 11:23+0100\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s 是é‡å°æ–¼ %s %s 並編譯在 %s %s\n" @@ -636,7 +636,7 @@ msgstr "無法將 %s æ›´å為 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正è¦è¡¨ç¤ºæ³•å‡ºéŒ¯ - %s" @@ -799,11 +799,11 @@ msgstr "有套件需è¦è¢«ç§»é™¤,但移除動作被ç¦æ­¢ã€‚" msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤：新增轉移(diversion)失敗" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "無法讀å–來æºå–®ã€‚" @@ -832,7 +832,7 @@ msgstr "解壓縮後將消耗 %sB 的空間。\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "解壓縮後將空出 %sB 的空間。\n" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "『%sã€å…§æ²’有足夠的空間。" @@ -869,7 +869,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] éµï¼Œå¦æŒ‰ [n] éµ " -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%sã€æª”案。%s\n" @@ -878,7 +878,7 @@ msgstr "無法下載『%sã€æª”案。%s\n" msgid "Some files failed to download" msgstr "部份檔案無法下載" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "下載完畢,ç›®å‰æ˜¯â€œåƒ…下載â€æ¨¡å¼" @@ -975,39 +975,39 @@ msgstr "未找到“%2$sâ€çš„“%1$sâ€ç‰ˆæœ¬" msgid "Selected version %s (%s) for %s\n" msgstr "é¸å®šçš„版本為 %s (%s) çš„ %s\n" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "update 指令ä¸éœ€ä»»ä½•åƒæ•¸" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "有一些索引檔案ä¸èƒ½ä¸‹è¼‰,它們å¯èƒ½è¢«å¿½ç•¥äº†,也å¯èƒ½è½‰è€Œä½¿ç”¨äº†èˆŠçš„索引檔案。" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造æˆéŒ¯èª¤" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "無法找到 %s 套件。" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注æ„,根據正è¦è¡¨ç¤ºæ³•â€œ%2$sâ€é¸æ“‡äº† %1$s\n" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "用『apt-get -f installã€æŒ‡ä»¤æˆ–許能修正這些å•é¡Œã€‚" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1015,7 +1015,7 @@ msgstr "" "無法滿足的相ä¾é—œä¿‚。請嘗試ä¸æŒ‡å®šå¥—件明æˆä¾†åŸ·è¡Œâ€œapt-get -f installâ€(或指>\n" "定一個解決辦法)。" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -1026,7 +1026,7 @@ msgstr "" "或是您使用ä¸ç©©å®š(unstable)發行版而這些需è¦çš„套件尚未完æˆ\n" "或從 Incoming 目錄移除。" -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1036,122 +1036,122 @@ msgstr "" "該套件無法安è£,您最好æ交一個é‡å°é€™å€‹å¥—件\n" "的臭蟲報告。" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "底下的資訊有助於解決ç¾åœ¨çš„情æ³:" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "æ毀的套件" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "下列的ã€æ–°ã€‘套件都將被安è£ï¼š" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "籌畫å‡ç´šå¥—件中..." -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "完æˆ" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "內部錯誤,AllUpgrade 造æˆéŒ¯èª¤" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個å°æ‡‰çš„套件æ‰èƒ½ä¸‹è¼‰æºç¢¼" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的æºç¢¼" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "『%sã€å…§æ²’有足夠的空間。" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需è¦ä¸‹è¼‰ %2$sB 中 %1$sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需è¦ä¸‹è¼‰ %sB 的原始檔案。\n" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "下載æºç¢¼ %s\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "無法下載æŸäº›æª”案。" -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "ç•¥éŽå·²ç¶“被解開到 %s 目錄的æºç¢¼æª”案\n" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "å­ç¨‹åºå¤±æ•—" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件æ‰èƒ½æª¢æŸ¥å…¶å»ºç«‹ç›¸ä¾é—œä¿‚(builddeps)" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法å–å¾— %s 的建構相ä¾é—œä¿‚。" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相ä¾é—œä¿‚訊æ¯ã€‚\n" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, 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:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1160,30 +1160,30 @@ msgstr "" "由於無法找到符åˆè¦æ±‚的套件 %3$s çš„å¯ç”¨ç‰ˆæœ¬,å› æ­¤ä¸èƒ½æ»¿è¶³ %2$s 所è¦æ±‚çš„ %1$s çš„" "相ä¾é—œä¿‚" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, 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:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所è¦æ±‚ %1$s 相ä¾é—œä¿‚:%3$s" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所è¦æ±‚的建構相ä¾é—œä¿‚。" -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "無法處ç†å»ºæ§‹ç›¸ä¾é—œä¿‚" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "支æ´æ¨¡çµ„:" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1435,7 +1435,7 @@ msgstr "é‡è¤‡çš„設定檔 %s/%s" msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "關閉檔案 %s 失敗" @@ -1488,7 +1488,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "檔案 %s/%s 複寫套件 %s 中的相åŒæª”案" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "無法讀å–『%sã€ã€‚" @@ -2290,52 +2291,52 @@ msgstr "無法辨識套件『%sã€(1)。" msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件『%sã€(1)。" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (通用資æºè­˜åˆ¥è™Ÿ)。" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (版本)。" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (通用資æºè­˜åˆ¥è™Ÿåˆ†è¾¨)。" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (特定版本)。" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來æºæª”『%2$sã€ç¬¬ %1$lu 行有錯誤 (版本分辨)。" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "開啟『%sã€ä¸­" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "來æºæª”『%2$sã€ç¬¬ %1$u 行太長。" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來æºæª”『%2$sã€ç¬¬ %1$u 行有錯誤 (類別)。" -#: apt-pkg/sourcelist.cc:191 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" +#: apt-pkg/sourcelist.cc:244 +#, fuzzy, c-format +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "未知的類別 %1$s 於來æºæª” %3$s 第 %2$u è¡Œ" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "來æºæª”『%2$sã€ç¬¬ %1$u 行有錯誤 (商家å稱)。" @@ -2404,12 +2405,12 @@ msgstr "" " '%s' 的光碟\n" "æ’å…¥ '%s' 碟機,然後按 [Enter] éµã€‚\n" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "本軟體ä¸æ”¯æŒã€Ž%sã€åŒ…è£æ³•ã€‚" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "無法明白系統類別。" @@ -2527,7 +2528,7 @@ msgstr "無法寫入來æºæš«å­˜æª”。" msgid "rename failed, %s (%s -> %s)." msgstr "檔å因『%sã€æ›´æ›å¤±æ•— (%s → %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼ä¸ç¬¦åˆã€‚" @@ -2538,20 +2539,20 @@ msgid "" "to manually fix this package. (due to missing arch)" msgstr "找ä¸åˆ°å¥—件『%sã€éœ€è¦çš„æŸæª”案。請您修ç†é€™å€‹å¥—件å†è©¦è©¦ã€‚" -#: apt-pkg/acquire-item.cc:775 +#: apt-pkg/acquire-item.cc:781 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找ä¸åˆ°å¥—件『%sã€éœ€è¦çš„æŸæª”案。請您修ç†é€™å€‹å¥—件å†è©¦è©¦ã€‚" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:817 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%sã€ç´¢å¼•æª”æ壞—缺少『Filename:ã€æ¬„。" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:904 msgid "Size mismatch" msgstr "檔案大å°ä¸ç¬¦åˆã€‚" -- cgit v1.2.3 From 46e00f9d71300f3a80a4a311e369e64a48ce396f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2005 19:34:02 +0000 Subject: * ABI change: merged more flexible pkgAcquireFile code --- apt-pkg/acquire-item.cc | 27 +++++++++++++++------------ apt-pkg/acquire-item.h | 11 ++++++++--- apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- debian/changelog | 1 + methods/makefile | 2 +- 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index debd1face..88c25de43 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -184,7 +184,7 @@ string pkgAcqIndex::Custom600Headers() void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { // no .bz2 found, retry with .gz - if(Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1) == "bz2") { + if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") { Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; // retry with a gzip one @@ -290,7 +290,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, else Local = true; - string compExt = Desc.URI.substr(Desc.URI.size()-3,Desc.URI.size()-1); + string compExt = Desc.URI.substr(Desc.URI.size()-3); char *decompProg; if(compExt == "bz2") decompProg = "bzip2"; @@ -315,10 +315,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, const vector* IndexTargets, indexRecords* MetaIndexParser) : Item(Owner), RealURI(URI), MetaIndexURI(MetaIndexURI), - MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc) + MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc), + MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets) { - this->MetaIndexParser = MetaIndexParser; - this->IndexTargets = IndexTargets; DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); @@ -430,11 +429,9 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, string SigFile, const vector* IndexTargets, indexRecords* MetaIndexParser) : - Item(Owner), RealURI(URI), SigFile(SigFile) + Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false), + MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets) { - this->AuthPass = false; - this->MetaIndexParser = MetaIndexParser; - this->IndexTargets = IndexTargets; DestFile = _config->FindDir("Dir::State::lists") + "partial/"; DestFile += URItoFileName(URI); @@ -1008,13 +1005,19 @@ void pkgAcqArchive::Finished() // --------------------------------------------------------------------- /* The file is added to the queue */ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI,string MD5, - unsigned long Size,string Dsc,string ShortDesc) : + unsigned long Size,string Dsc,string ShortDesc, + const string &DestDir, const string &DestFilename) : Item(Owner), Md5Hash(MD5) { Retries = _config->FindI("Acquire::Retries",0); - DestFile = flNotDir(URI); - + if(!DestFilename.empty()) + DestFile = DestFilename; + else if(!DestDir.empty()) + DestFile = DestDir + "/" + flNotDir(URI); + else + DestFile = flNotDir(URI); + // Create the item Desc.URI = URI; Desc.Description = Dsc; diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 90f80368b..c34b5ef69 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -224,9 +224,14 @@ class pkgAcqFile : public pkgAcquire::Item pkgAcquire::MethodConfig *Cnf); virtual string MD5Sum() {return Md5Hash;}; virtual string DescURI() {return Desc.URI;}; - - pkgAcqFile(pkgAcquire *Owner,string URI,string MD5,unsigned long Size, - string Desc,string ShortDesc); + + // If DestFilename is empty, download to DestDir/ if + // DestDir is non-empty, $CWD/ otherwise. If + // DestFilename is NOT empty, DestDir is ignored and DestFilename + // is the absolute name to which the file should be downloaded. + pkgAcqFile(pkgAcquire *Owner, string URI, string MD5, unsigned long Size, + string Desc, string ShortDesc, + const string &DestDir="", const string &DestFilename=""); }; #endif diff --git a/apt-pkg/init.h b/apt-pkg/init.h index e21351797..8255b406a 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 3 -#define APT_PKG_MINOR 10 +#define APT_PKG_MINOR 11 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 8de7d945e..0e6aecc65 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.10 +MAJOR=3.11 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/debian/changelog b/debian/changelog index bca8a14b1..2022448a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ apt (0.6.42.4) unstable; urgency=low * make pkgDirStream (a bit) more complete * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows) (closes: #339533) + * pkgAcqFile is more flexible now (closes: #57091) -- diff --git a/methods/makefile b/methods/makefile index 06fd2a6fc..1e3b1ef85 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.10 +LIB_APT_PKG_MAJOR = 3.11 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method -- cgit v1.2.3 From 7c6e2dc761f736bf203f7770f7a1c4a63f7063d4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2005 22:11:06 +0000 Subject: * merged http download limit for apt (#146877) --- apt-pkg/acquire.cc | 6 +++++- debian/changelog | 5 +++-- doc/examples/configure-index | 1 + methods/http.cc | 41 +++++++++++++++++++++++++++++++++++++++-- methods/http.h | 5 +++++ 5 files changed, 53 insertions(+), 5 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 62209e65b..57cf60bfe 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -266,7 +266,11 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access) Worker Work(Conf); if (Work.Start() == false) return 0; - + + /* if a method uses DownloadLimit, we switch to SingleInstance mode */ + if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0) + Conf->SingleInstance = true; + return Conf; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 2022448a0..34f8cec03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.42.4) unstable; urgency=low +apt (0.6.43) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: * zh_CN.po: Completed to 510 strings(Closes: #338267) @@ -9,8 +9,9 @@ apt (0.6.42.4) unstable; urgency=low * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows) (closes: #339533) * pkgAcqFile is more flexible now (closes: #57091) + * support a download rate limit for http (closes: #146877) - -- + -- apt (0.6.42.3) unstable; urgency=low diff --git a/doc/examples/configure-index b/doc/examples/configure-index index a93b74349..9e851d753 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -117,6 +117,7 @@ Acquire No-Cache "false"; Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate }; ftp diff --git a/methods/http.cc b/methods/http.cc index ba86aa6b6..a5c9601e7 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -58,6 +58,12 @@ unsigned long PipelineDepth = 10; unsigned long TimeOut = 120; bool Debug = false; + +unsigned long CircleBuf::BwReadLimit=0; +unsigned long CircleBuf::BwTickReadData=0; +struct timeval CircleBuf::BwReadTick={0,0}; +const unsigned int CircleBuf::BW_HZ=10; + // CircleBuf::CircleBuf - Circular input buffer /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -65,6 +71,8 @@ CircleBuf::CircleBuf(unsigned long Size) : Size(Size), Hash(0) { Buf = new unsigned char[Size]; Reset(); + + CircleBuf::BwReadLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; } /*}}}*/ // CircleBuf::Reset - Reset to the default state /*{{{*/ @@ -90,16 +98,45 @@ void CircleBuf::Reset() is non-blocking.. */ bool CircleBuf::Read(int Fd) { + unsigned long BwReadMax; + while (1) { // Woops, buffer is full if (InP - OutP == Size) return true; - + + // what's left to read in this tick + BwReadMax = CircleBuf::BwReadLimit/BW_HZ; + + if(CircleBuf::BwReadLimit) { + struct timeval now; + gettimeofday(&now,0); + + unsigned long d = (now.tv_sec-CircleBuf::BwReadTick.tv_sec)*1000000 + + now.tv_usec-CircleBuf::BwReadTick.tv_usec; + if(d > 1000000/BW_HZ) { + CircleBuf::BwReadTick = now; + CircleBuf::BwTickReadData = 0; + } + + if(CircleBuf::BwTickReadData >= BwReadMax) { + usleep(1000000/BW_HZ); + return true; + } + } + // Write the buffer segment int Res; - Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(CircleBuf::BwReadLimit) { + Res = read(Fd,Buf + (InP%Size), + BwReadMax > LeftRead() ? LeftRead() : BwReadMax); + } else + Res = read(Fd,Buf + (InP%Size),LeftRead()); + if(Res > 0 && BwReadLimit > 0) + CircleBuf::BwTickReadData += Res; + if (Res == 0) return false; if (Res < 0) diff --git a/methods/http.h b/methods/http.h index c5a4d0e86..541e2952c 100644 --- a/methods/http.h +++ b/methods/http.h @@ -31,6 +31,11 @@ class CircleBuf unsigned long MaxGet; struct timeval Start; + static unsigned long BwReadLimit; + static unsigned long BwTickReadData; + static struct timeval BwReadTick; + static const unsigned int BW_HZ; + unsigned long LeftRead() { unsigned long Sz = Size - (InP - OutP); -- cgit v1.2.3 From 171c75f13acc955110a6c4693c7b8fe243709843 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 23 Nov 2005 00:00:13 +0000 Subject: * applied parts of the string speedup patch from debian #319377 (ABI change) --- apt-pkg/contrib/configuration.cc | 26 +++--- apt-pkg/contrib/configuration.h | 28 +++--- apt-pkg/contrib/mmap.h | 2 +- apt-pkg/contrib/progress.cc | 4 +- apt-pkg/contrib/progress.h | 4 +- apt-pkg/contrib/strutl.cc | 67 +++++++------- apt-pkg/contrib/strutl.h | 26 +++--- apt-pkg/deb/deblistparser.cc | 4 +- apt-pkg/pkgcache.cc | 4 +- apt-pkg/pkgcache.h | 6 +- apt-pkg/pkgcachegen.cc | 16 ++-- apt-pkg/pkgcachegen.h | 17 ++-- configure.in | 2 +- debian/changelog | 3 +- po/apt-all.pot | 185 ++++++++++++++++++++------------------- po/bs.po | 58 ++++++------ po/ca.po | 58 ++++++------ po/cs.po | 58 ++++++------ po/da.po | 58 ++++++------ po/de.po | 58 ++++++------ po/el.po | 58 ++++++------ po/en_GB.po | 58 ++++++------ po/es.po | 58 ++++++------ po/eu.po | 58 ++++++------ po/fi.po | 58 ++++++------ po/fr.po | 58 ++++++------ po/he.po | 58 ++++++------ po/hu.po | 58 ++++++------ po/it.po | 58 ++++++------ po/ja.po | 58 ++++++------ po/ko.po | 58 ++++++------ po/nb.po | 58 ++++++------ po/nl.po | 58 ++++++------ po/nn.po | 58 ++++++------ po/pl.po | 58 ++++++------ po/pt.po | 58 ++++++------ po/pt_BR.po | 58 ++++++------ po/ro.po | 58 ++++++------ po/ru.po | 58 ++++++------ po/sk.po | 58 ++++++------ po/sl.po | 58 ++++++------ po/sv.po | 58 ++++++------ po/tl.po | 58 ++++++------ po/zh_CN.po | 58 ++++++------ po/zh_TW.po | 58 ++++++------ 45 files changed, 1068 insertions(+), 1066 deletions(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 09e454be9..14a000fa5 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -110,7 +110,7 @@ Configuration::Item *Configuration::Lookup(Item *Head,const char *S, return 0; I = new Item; - I->Tag = string(S,Len); + I->Tag.assign(S,Len); I->Next = *Last; I->Parent = Head; *Last = I; @@ -161,7 +161,7 @@ string Configuration::Find(const char *Name,const char *Default) const if (Itm == 0 || Itm->Value.empty() == true) { if (Default == 0) - return string(); + return ""; else return Default; } @@ -180,7 +180,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const if (Itm == 0 || Itm->Value.empty() == true) { if (Default == 0) - return string(); + return ""; else return Default; } @@ -294,7 +294,7 @@ string Configuration::FindAny(const char *Name,const char *Default) const // Configuration::CndSet - Conditinal Set a value /*{{{*/ // --------------------------------------------------------------------- /* This will not overwrite */ -void Configuration::CndSet(const char *Name,string Value) +void Configuration::CndSet(const char *Name,const string &Value) { Item *Itm = Lookup(Name,true); if (Itm == 0) @@ -306,7 +306,7 @@ void Configuration::CndSet(const char *Name,string Value) // Configuration::Set - Set a value /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Set(const char *Name,string Value) +void Configuration::Set(const char *Name,const string &Value) { Item *Itm = Lookup(Name,true); if (Itm == 0) @@ -330,7 +330,7 @@ void Configuration::Set(const char *Name,int Value) // Configuration::Clear - Clear an single value from a list /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Clear(string Name, int Value) +void Configuration::Clear(const string Name, int Value) { char S[300]; snprintf(S,sizeof(S),"%i",Value); @@ -340,7 +340,7 @@ void Configuration::Clear(string Name, int Value) // Configuration::Clear - Clear an single value from a list /*{{{*/ // --------------------------------------------------------------------- /* */ -void Configuration::Clear(string Name, string Value) +void Configuration::Clear(const string Name, string Value) { Item *Top = Lookup(Name.c_str(),false); if (Top == 0 || Top->Child == 0) @@ -377,7 +377,7 @@ void Configuration::Clear(string Name) if (Top == 0) return; - Top->Value = string(); + Top->Value.clear(); Item *Stop = Top; Top = Top->Child; Stop->Child = 0; @@ -485,7 +485,7 @@ string Configuration::Item::FullTag(const Item *Stop) const sections like 'zone "foo.org" { .. };' This causes each section to be added in with a tag like "zone::foo.org" instead of being split tag/value. AsSectional enables Sectional parsing.*/ -bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional, +bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, unsigned Depth) { // Open the stream for reading @@ -711,13 +711,13 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional, } // Empty the buffer - LineBuffer = string(); + LineBuffer.clear(); // Move up a tag, but only if there is no bit to parse if (TermChar == '}') { if (StackPos == 0) - ParentTag = string(); + ParentTag.clear(); else ParentTag = Stack[--StackPos]; } @@ -742,8 +742,8 @@ bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional, // ReadConfigDir - Read a directory of config files /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional, - unsigned Depth) +bool ReadConfigDir(Configuration &Conf,const string &Dir,bool AsSectional, + unsigned Depth) { DIR *D = opendir(Dir.c_str()); if (D == 0) diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 789bc82cf..0d4078dab 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -69,30 +69,30 @@ class Configuration public: string Find(const char *Name,const char *Default = 0) const; - string Find(string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);}; + string Find(const string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);}; string FindFile(const char *Name,const char *Default = 0) const; string FindDir(const char *Name,const char *Default = 0) const; int FindI(const char *Name,int Default = 0) const; - int FindI(string Name,int Default = 0) const {return FindI(Name.c_str(),Default);}; + int FindI(const string Name,int Default = 0) const {return FindI(Name.c_str(),Default);}; bool FindB(const char *Name,bool Default = false) const; - bool FindB(string Name,bool Default = false) const {return FindB(Name.c_str(),Default);}; + bool FindB(const string Name,bool Default = false) const {return FindB(Name.c_str(),Default);}; string FindAny(const char *Name,const char *Default = 0) const; - inline void Set(string Name,string Value) {Set(Name.c_str(),Value);}; - void CndSet(const char *Name,string Value); - void Set(const char *Name,string Value); + inline void Set(const string Name,string Value) {Set(Name.c_str(),Value);}; + void CndSet(const char *Name,const string &Value); + void Set(const char *Name,const string &Value); void Set(const char *Name,int Value); - inline bool Exists(string Name) const {return Exists(Name.c_str());}; + inline bool Exists(const string Name) const {return Exists(Name.c_str());}; bool Exists(const char *Name) const; bool ExistsAny(const char *Name) const; // clear a whole tree - void Clear(string Name); + void Clear(const string Name); // remove a certain value from a list (e.g. the list of "APT::Keep-Fds") - void Clear(string List, string Value); - void Clear(string List, int Value); + void Clear(const string List, string Value); + void Clear(const string List, int Value); inline const Item *Tree(const char *Name) const {return Lookup(Name);}; @@ -106,10 +106,12 @@ class Configuration extern Configuration *_config; -bool ReadConfigFile(Configuration &Conf,string FName,bool AsSectional = false, +bool ReadConfigFile(Configuration &Conf,const string &FName, + bool AsSectional = false, unsigned Depth = 0); -bool ReadConfigDir(Configuration &Conf,string Dir,bool AsSectional = false, - unsigned Depth = 0); +bool ReadConfigDir(Configuration &Conf,const string &Dir, + bool AsSectional = false, + unsigned Depth = 0); #endif diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index caffa0f90..e329b167a 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -94,7 +94,7 @@ class DynamicMMap : public MMap unsigned long RawAllocate(unsigned long Size,unsigned long Aln = 0); unsigned long Allocate(unsigned long ItemSize); unsigned long WriteString(const char *String,unsigned long Len = (unsigned long)-1); - inline unsigned long WriteString(string S) {return WriteString(S.c_str(),S.length());}; + inline unsigned long WriteString(const string &S) {return WriteString(S.c_str(),S.length());}; void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;}; DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace = 2*1024*1024); diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 8eb36fc20..cb272e389 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -50,7 +50,7 @@ void OpProgress::Progress(unsigned long Cur) // --------------------------------------------------------------------- /* */ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total, - unsigned long Size,string Op) + unsigned long Size,const string &Op) { this->Current = Current; this->Total = Total; @@ -67,7 +67,7 @@ void OpProgress::OverallProgress(unsigned long Current, unsigned long Total, // OpProgress::SubProgress - Set the sub progress state /*{{{*/ // --------------------------------------------------------------------- /* */ -void OpProgress::SubProgress(unsigned long SubTotal,string Op) +void OpProgress::SubProgress(unsigned long SubTotal,const string &Op) { this->SubTotal = SubTotal; SubOp = Op; diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index d0b1f5f94..20caf4cdf 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -59,9 +59,9 @@ class OpProgress void Progress(unsigned long Current); void SubProgress(unsigned long SubTotal); - void SubProgress(unsigned long SubTotal,string Op); + void SubProgress(unsigned long SubTotal,const string &Op); void OverallProgress(unsigned long Current,unsigned long Total, - unsigned long Size,string Op); + unsigned long Size,const string &Op); virtual void Done() {}; OpProgress(); diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index a75fbdf92..d96155917 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -199,10 +199,10 @@ bool ParseCWord(const char *&String,string &Res) // QuoteString - Convert a string into quoted from /*{{{*/ // --------------------------------------------------------------------- /* */ -string QuoteString(string Str,const char *Bad) +string QuoteString(const string &Str, const char *Bad) { string Res; - for (string::iterator I = Str.begin(); I != Str.end(); I++) + for (string::const_iterator I = Str.begin(); I != Str.end(); I++) { if (strchr(Bad,*I) != 0 || isprint(*I) == 0 || *I <= 0x20 || *I >= 0x7F) @@ -220,7 +220,7 @@ string QuoteString(string Str,const char *Bad) // DeQuoteString - Convert a string from quoted from /*{{{*/ // --------------------------------------------------------------------- /* This undoes QuoteString */ -string DeQuoteString(string Str) +string DeQuoteString(const string &Str) { string Res; for (string::const_iterator I = Str.begin(); I != Str.end(); I++) @@ -317,7 +317,7 @@ string TimeToStr(unsigned long Sec) // SubstVar - Substitute a string for another string /*{{{*/ // --------------------------------------------------------------------- /* This replaces all occurances of Subst with Contents in Str. */ -string SubstVar(string Str,string Subst,string Contents) +string SubstVar(const string &Str,const string &Subst,const string &Contents) { string::size_type Pos = 0; string::size_type OldPos = 0; @@ -348,21 +348,18 @@ string SubstVar(string Str,const struct SubstVar *Vars) /* This converts a URI into a safe filename. It quotes all unsafe characters and converts / to _ and removes the scheme identifier. The resulting file name should be unique and never occur again for a different file */ -string URItoFileName(string URI) +string URItoFileName(const string &URI) { // Nuke 'sensitive' items ::URI U(URI); - U.User = string(); - U.Password = string(); - U.Access = ""; + U.User.clear(); + U.Password.clear(); + U.Access.clear(); // "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF"; - URI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*"); - string::iterator J = URI.begin(); - for (; J != URI.end(); J++) - if (*J == '/') - *J = '_'; - return URI; + string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*"); + replace(NewURI.begin(),NewURI.end(),'/','_'); + return NewURI; } /*}}}*/ // Base64Encode - Base64 Encoding routine for short strings /*{{{*/ @@ -371,7 +368,7 @@ string URItoFileName(string URI) from wget and then patched and bug fixed. This spec can be found in rfc2045 */ -string Base64Encode(string S) +string Base64Encode(const string &S) { // Conversion table. static char tbl[64] = {'A','B','C','D','E','F','G','H', @@ -540,17 +537,17 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, // --------------------------------------------------------------------- /* The format is like those used in package files and the method communication system */ -string LookupTag(string Message,const char *Tag,const char *Default) +string LookupTag(const string &Message,const char *Tag,const char *Default) { // Look for a matching tag. int Length = strlen(Tag); - for (string::iterator I = Message.begin(); I + Length < Message.end(); I++) + for (string::const_iterator I = Message.begin(); I + Length < Message.end(); I++) { // Found the tag if (I[Length] == ':' && stringcasecmp(I,I+Length,Tag) == 0) { // Find the end of line and strip the leading/trailing spaces - string::iterator J; + string::const_iterator J; I += Length + 1; for (; isspace(*I) != 0 && I < Message.end(); I++); for (J = I; *J != '\n' && J < Message.end(); J++); @@ -572,7 +569,7 @@ string LookupTag(string Message,const char *Tag,const char *Default) // --------------------------------------------------------------------- /* This inspects the string to see if it is true or if it is false and then returns the result. Several varients on true/false are checked. */ -int StringToBool(string Text,int Default) +int StringToBool(const string &Text,int Default) { char *End; int Res = strtol(Text.c_str(),&End,0); @@ -738,7 +735,7 @@ static time_t timegm(struct tm *t) '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 handles the weird, but unambiguous FTP time format*/ -bool StrToTime(string Val,time_t &Result) +bool StrToTime(const string &Val,time_t &Result) { struct tm Tm; char Month[10]; @@ -825,7 +822,7 @@ static int HexDigit(int c) // Hex2Num - Convert a long hex number into a buffer /*{{{*/ // --------------------------------------------------------------------- /* The length of the buffer must be exactly 1/2 the length of the string. */ -bool Hex2Num(string Str,unsigned char *Num,unsigned int Length) +bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length) { if (Str.length() != Length*2) return false; @@ -986,7 +983,7 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...) // --------------------------------------------------------------------- /* The domain list is a comma seperate list of domains that are suffix matched against the argument */ -bool CheckDomainList(string Host,string List) +bool CheckDomainList(const string &Host,const string &List) { string::const_iterator Start = List.begin(); for (string::const_iterator Cur = List.begin(); Cur <= List.end(); Cur++) @@ -1009,7 +1006,7 @@ bool CheckDomainList(string Host,string List) // URI::CopyFrom - Copy from an object /*{{{*/ // --------------------------------------------------------------------- /* This parses the URI into all of its components */ -void URI::CopyFrom(string U) +void URI::CopyFrom(const string &U) { string::const_iterator I = U.begin(); @@ -1038,9 +1035,9 @@ void URI::CopyFrom(string U) SingleSlash = U.end(); // We can now write the access and path specifiers - Access = string(U,0,FirstColon - U.begin()); + Access.assign(U.begin(),FirstColon); if (SingleSlash != U.end()) - Path = string(U,SingleSlash - U.begin()); + Path.assign(SingleSlash,U.end()); if (Path.empty() == true) Path = "/"; @@ -1070,14 +1067,14 @@ void URI::CopyFrom(string U) if (At == SingleSlash) { if (FirstColon < SingleSlash) - Host = string(U,FirstColon - U.begin(),SingleSlash - FirstColon); + Host.assign(FirstColon,SingleSlash); } else { - Host = string(U,At - U.begin() + 1,SingleSlash - At - 1); - User = string(U,FirstColon - U.begin(),SecondColon - FirstColon); + Host.assign(At+1,SingleSlash); + User.assign(FirstColon,SecondColon); if (SecondColon < At) - Password = string(U,SecondColon - U.begin() + 1,At - SecondColon - 1); + Password.assign(SecondColon+1,At); } // Now we parse the RFC 2732 [] hostnames. @@ -1105,7 +1102,7 @@ void URI::CopyFrom(string U) // Tsk, weird. if (InBracket == true) { - Host = string(); + Host.clear(); return; } @@ -1116,7 +1113,7 @@ void URI::CopyFrom(string U) return; Port = atoi(string(Host,Pos+1).c_str()); - Host = string(Host,0,Pos); + Host.assign(Host,0,Pos); } /*}}}*/ // URI::operator string - Convert the URI to a string /*{{{*/ @@ -1171,12 +1168,12 @@ URI::operator string() // URI::SiteOnly - Return the schema and site for the URI /*{{{*/ // --------------------------------------------------------------------- /* */ -string URI::SiteOnly(string URI) +string URI::SiteOnly(const string &URI) { ::URI U(URI); - U.User = string(); - U.Password = string(); - U.Path = string(); + U.User.clear(); + U.Password.clear(); + U.Path.clear(); U.Port = 0; return U; } diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 353e78ac9..6ec2b7811 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -43,24 +43,24 @@ char *_strstrip(char *String); char *_strtabexpand(char *String,size_t Len); bool ParseQuoteWord(const char *&String,string &Res); bool ParseCWord(const char *&String,string &Res); -string QuoteString(string Str,const char *Bad); -string DeQuoteString(string Str); +string QuoteString(const string &Str,const char *Bad); +string DeQuoteString(const string &Str); string SizeToStr(double Bytes); string TimeToStr(unsigned long Sec); -string Base64Encode(string Str); -string URItoFileName(string URI); +string Base64Encode(const string &Str); +string URItoFileName(const string &URI); string TimeRFC1123(time_t Date); -bool StrToTime(string Val,time_t &Result); -string LookupTag(string Message,const char *Tag,const char *Default = 0); -int StringToBool(string Text,int Default = -1); +bool StrToTime(const string &Val,time_t &Result); +string LookupTag(const string &Message,const char *Tag,const char *Default = 0); +int StringToBool(const string &Text,int Default = -1); bool ReadMessages(int Fd, vector &List); bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0); -bool Hex2Num(string Str,unsigned char *Num,unsigned int Length); +bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); void ioprintf(ostream &out,const char *format,...) APT_FORMAT2; char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3; -bool CheckDomainList(string Host,string List); +bool CheckDomainList(const string &Host, const string &List); #define APT_MKSTRCMP(name,func) \ inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \ @@ -101,7 +101,7 @@ inline const char *DeNull(const char *s) {return (s == 0?"(null)":s);}; class URI { - void CopyFrom(string From); + void CopyFrom(const string &From); public: @@ -113,9 +113,9 @@ class URI unsigned int Port; operator string(); - inline void operator =(string From) {CopyFrom(From);}; + inline void operator =(const string &From) {CopyFrom(From);}; inline bool empty() {return Access.empty();}; - static string SiteOnly(string URI); + static string SiteOnly(const string &URI); URI(string Path) {CopyFrom(Path);}; URI() : Port(0) {}; @@ -127,7 +127,7 @@ struct SubstVar const string *Contents; }; string SubstVar(string Str,const struct SubstVar *Vars); -string SubstVar(string Str,string Subst,string Contents); +string SubstVar(const string &Str,const string &Subst,const string &Contents); struct RxChoiceList { diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 25b533773..b11d2531c 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -377,12 +377,12 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, const char *End = I; for (; End > Start && isspace(End[-1]); End--); - Ver = string(Start,End-Start); + Ver.assign(Start,End-Start); I++; } else { - Ver = string(); + Ver.clear(); Op = pkgCache::Dep::NoOp; } diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 6ef7cafb0..9926befe9 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -153,7 +153,7 @@ bool pkgCache::ReMap() /* This is used to generate the hash entries for the HashTable. With my package list from bo this function gets 94% table usage on a 512 item table (480 used items) */ -unsigned long pkgCache::sHash(string Str) const +unsigned long pkgCache::sHash(const string &Str) const { unsigned long Hash = 0; for (string::const_iterator I = Str.begin(); I != Str.end(); I++) @@ -173,7 +173,7 @@ unsigned long pkgCache::sHash(const char *Str) const // Cache::FindPkg - Locate a package by name /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::FindPkg(string Name) +pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) { // Look at the hash bucket Package *Pkg = PkgP + HeaderP->HashTable[Hash(Name)]; diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index b07951dfb..587d97534 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -89,7 +89,7 @@ class pkgCache string CacheFile; MMap ⤅ - unsigned long sHash(string S) const; + unsigned long sHash(const string &S) const; unsigned long sHash(const char *S) const; public: @@ -111,14 +111,14 @@ class pkgCache inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();}; // String hashing function (512 range) - inline unsigned long Hash(string S) const {return sHash(S);}; + inline unsigned long Hash(const string &S) const {return sHash(S);}; inline unsigned long Hash(const char *S) const {return sHash(S);}; // Usefull transformation things const char *Priority(unsigned char Priority); // Accessors - PkgIterator FindPkg(string Name); + PkgIterator FindPkg(const string &Name); Header &Head() {return *HeaderP;}; inline PkgIterator PkgBegin(); inline PkgIterator PkgEnd(); diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 2340f97fd..de854bee5 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -266,7 +266,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) // CacheGenerator::NewPackage - Add a new package /*{{{*/ // --------------------------------------------------------------------- /* This creates a new package structure and adds it to the hash table */ -bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,string Name) +bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name) { Pkg = Cache.FindPkg(Name); if (Pkg.end() == false) @@ -330,7 +330,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, // --------------------------------------------------------------------- /* This puts a version structure in the linked list */ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, - string VerStr, + const string &VerStr, unsigned long Next) { // Get a structure @@ -354,8 +354,8 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, /* This creates a dependency element in the tree. It is linked to the version and to the package that it is pointing to. */ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, - string PackageName, - string Version, + const string &PackageName, + const string &Version, unsigned int Op, unsigned int Type) { @@ -419,8 +419,8 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, // --------------------------------------------------------------------- /* */ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, - string PackageName, - string Version) + const string &PackageName, + const string &Version) { pkgCache &Cache = Owner->Cache; @@ -459,7 +459,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, // --------------------------------------------------------------------- /* This is used to select which file is to be associated with all newly added versions. The caller is responsible for setting the IMS fields. */ -bool pkgCacheGenerator::SelectFile(string File,string Site, +bool pkgCacheGenerator::SelectFile(const string &File,const string &Site, const pkgIndexFile &Index, unsigned long Flags) { @@ -543,7 +543,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, /* This just verifies that each file in the list of index files exists, has matching attributes with the cache and the cache does not have any extra files. */ -static bool CheckValidity(string CacheFile, FileIterator Start, +static bool CheckValidity(const string &CacheFile, FileIterator Start, FileIterator End,MMap **OutMap = 0) { // No file, certainly invalid diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 7d0920629..9a729eea4 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -53,17 +53,17 @@ class pkgCacheGenerator // Flag file dependencies bool FoundFileDeps; - bool NewPackage(pkgCache::PkgIterator &Pkg,string Pkg); + bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Pkg); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); - unsigned long NewVersion(pkgCache::VerIterator &Ver,string VerStr,unsigned long Next); + unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); public: unsigned long WriteUniqString(const char *S,unsigned int Size); - inline unsigned long WriteUniqString(string S) {return WriteUniqString(S.c_str(),S.length());}; + inline unsigned long WriteUniqString(const string &S) {return WriteUniqString(S.c_str(),S.length());}; void DropProgress() {Progress = 0;}; - bool SelectFile(string File,string Site,pkgIndexFile const &Index, + bool SelectFile(const string &File,const string &Site,pkgIndexFile const &Index, unsigned long Flags = 0); bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0); inline pkgCache &GetCache() {return Cache;}; @@ -94,12 +94,13 @@ class pkgCacheGenerator::ListParser inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);}; inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);}; - inline unsigned long WriteString(string S) {return Owner->Map.WriteString(S);}; + inline unsigned long WriteString(const string &S) {return Owner->Map.WriteString(S);}; inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);}; - bool NewDepends(pkgCache::VerIterator Ver,string Package, - string Version,unsigned int Op, + bool NewDepends(pkgCache::VerIterator Ver,const string &Package, + const string &Version,unsigned int Op, unsigned int Type); - bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version); + bool NewProvides(pkgCache::VerIterator Ver,const string &Package, + const string &Version); public: diff --git a/configure.in b/configure.in index bc5d2b572..18cdbfdde 100644 --- a/configure.in +++ b/configure.in @@ -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) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.42.4") +AC_DEFINE_UNQUOTED(VERSION,"0.6.43") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 34f8cec03..92dda6232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,9 @@ apt (0.6.43) unstable; urgency=low (closes: #339533) * pkgAcqFile is more flexible now (closes: #57091) * support a download rate limit for http (closes: #146877) + * imported lots of the speedup changes from #319377 - -- + -- apt (0.6.42.3) unstable; urgency=low diff --git a/po/apt-all.pot b/po/apt-all.pot index 7ed987c02..f474c6a41 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-25 18:41+0200\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -535,7 +535,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1517 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -694,11 +694,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844 +#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -727,7 +727,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958 +#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -761,7 +761,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -770,7 +770,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006 msgid "Download complete and in download only mode" msgstr "" @@ -862,45 +862,45 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1311 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422 +#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1382 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1401 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1527 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1553 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1560 +#: cmdline/apt-get.cc:1556 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1568 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" @@ -908,158 +908,158 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1580 +#: cmdline/apt-get.cc:1576 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1581 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1588 +#: cmdline/apt-get.cc:1584 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1614 +#: cmdline/apt-get.cc:1610 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1685 +#: cmdline/apt-get.cc:1681 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1686 +#: cmdline/apt-get.cc:1682 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1702 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:1710 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1883 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1961 +#: cmdline/apt-get.cc:1957 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:1962 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1969 +#: cmdline/apt-get.cc:1965 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2002 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2046 +#: cmdline/apt-get.cc:2042 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2047 +#: cmdline/apt-get.cc:2043 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2064 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2079 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2095 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2127 +#: cmdline/apt-get.cc:2123 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2143 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2195 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2247 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2282 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2311 +#: cmdline/apt-get.cc:2307 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2325 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2357 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2398 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1260,7 +1260,7 @@ msgstr "" msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "" @@ -1313,7 +1313,8 @@ msgid "File %s/%s overwrites the one in the package %s" msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -1608,7 +1609,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1738,76 +1739,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "" @@ -1820,7 +1821,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "" @@ -1941,7 +1942,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2108,52 +2109,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:87 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:89 +#: apt-pkg/sourcelist.cc:96 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:99 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:98 +#: apt-pkg/sourcelist.cc:105 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:112 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:156 +#: apt-pkg/sourcelist.cc:203 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:187 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:191 +#: apt-pkg/sourcelist.cc:244 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" +msgid "Type '%s' is not known in on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2197,7 +2198,7 @@ msgstr "" msgid "Archive directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2217,12 +2218,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:119 +#: apt-pkg/init.cc:120 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:135 +#: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2340,31 +2341,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, 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:775 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:811 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:898 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "" diff --git a/po/bs.po b/po/bs.po index 759e653e4..b928190a8 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: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -1329,7 +1329,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ne mogu Äitati %s" @@ -1627,7 +1627,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1758,76 +1758,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "ÄŒekam na zaglavlja" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Povezivanje neuspjeÅ¡no" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "UnutraÅ¡nja greÅ¡ka" @@ -1840,7 +1840,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "" @@ -1961,7 +1961,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2218,7 +2218,7 @@ msgstr "" msgid "Archive directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2361,31 +2361,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "" diff --git a/po/ca.po b/po/ca.po index 78aa65657..bd1f47988 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -1511,7 +1511,7 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@ -1817,7 +1817,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:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1953,76 +1953,76 @@ msgstr "No s'ha pogut obrir un conducte per a %s" msgid "Read error from %s process" msgstr "Error llegint des del procés %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor http ha enviat una capçalera de resposta no vàlida" -#: methods/http.cc:553 +#: methods/http.cc:590 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/http.cc:568 +#: methods/http.cc:605 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/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Aquest servidor http té el suport d'abast trencat" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Error intern" @@ -2035,7 +2035,7 @@ msgstr "No es pot transferir un fitxer buit a memòria" msgid "Couldn't make mmap of %lu bytes" msgstr "No s'ha pogut crear un mapa de memòria de %lu octets" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" @@ -2156,7 +2156,7 @@ msgstr "Operació no vàlida %s" msgid "Unable to stat the mount point %s" msgstr "No es pot obtenir informació del punt de muntatge %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "No es pot canviar a %s" @@ -2421,7 +2421,7 @@ msgstr "Falta el directori de llistes %spartial." msgid "Archive directory %spartial is missing." msgstr "Falta el directori d'arxiu %spartial." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2573,11 +2573,11 @@ msgstr "Error d'E/S en desar la memòria cau de la font" msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2587,7 +2587,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2596,7 +2596,7 @@ msgstr "" "No ha estat possible localitzar un fitxer pel paquet %s. Això podria " "significar que haureu d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2604,7 +2604,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Mida diferent" diff --git a/po/cs.po b/po/cs.po index f07a7ccb5..d7ccea80c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -1490,7 +1490,7 @@ msgstr "Soubor %s/%s pÅ™episuje ten z balíku %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nemohu Äíst %s" @@ -1793,7 +1793,7 @@ msgstr "Spojení datového socketu vyprÅ¡elo" msgid "Unable to accept connection" msgstr "Nemohu pÅ™ijmout spojení" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1925,76 +1925,76 @@ msgstr "Nemohu otevřít rouru pro %s" msgid "Read error from %s process" msgstr "Chyba Ätení z procesu %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "ÄŒekám na hlaviÄky" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal jsem jednu řádku hlaviÄky pÅ™es %u znaků" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Chybná hlaviÄka" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnou hlaviÄku odpovÄ›di" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnou hlaviÄku Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnou hlaviÄku Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "VýbÄ›r selhal" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "ÄŒas spojení vyprÅ¡el" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba Ätení ze serveru. Druhá strana zavÅ™ela spojení" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Chyba Ätení ze serveru" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Å patné datové záhlaví" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "VnitÅ™ní chyba" @@ -2007,7 +2007,7 @@ msgstr "Nemohu provést mmap prázdného souboru" msgid "Couldn't make mmap of %lu bytes" msgstr "NeÅ¡lo mmapovat %lu bajtů" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "VýbÄ›r %s nenalezen" @@ -2129,7 +2129,7 @@ msgstr "Neplatná operace %s" msgid "Unable to stat the mount point %s" msgstr "Nelze vyhodnotit přípojný bod %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nemohu pÅ™ejít do %s" @@ -2390,7 +2390,7 @@ msgstr "Adresář seznamů %spartial chybí." msgid "Archive directory %spartial is missing." msgstr "Archivní adresář %spartial chybí." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2539,11 +2539,11 @@ msgstr "Chyba IO pÅ™i ukládání zdrojové cache" msgid "rename failed, %s (%s -> %s)." msgstr "pÅ™ejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 souÄtů" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2552,7 +2552,7 @@ msgstr "" "Nebyl jsem schopen 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2561,14 +2561,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ruÄnÄ›." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, 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/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" diff --git a/po/da.po b/po/da.po index fa3780068..54fbdc88b 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-11-07 15:28+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -1496,7 +1496,7 @@ msgstr "File %s/%s overskriver filen i pakken %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke læse %s" @@ -1799,7 +1799,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1932,77 +1932,77 @@ msgstr "Kunne ikke msgid "Read error from %s process" msgstr "Læsefejl fra %s-process" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Afventer hoveder" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Fandt en enkelt linje i hovedet på over %u tegn" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "http-serveren sendte et ugyldigt svarhovede" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http-serveren sendte et ugyldigt Content-Length-hovede" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http-serveren sendte et ugyldigt Content-Range-hovede" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "" "Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Tidsudløb på forbindelsen" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Intern fejl" @@ -2015,7 +2015,7 @@ msgstr "Kan ikke udf msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke udføre mmap for %lu byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" @@ -2136,7 +2136,7 @@ msgstr "Ugyldig handling %s" msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kunne ikke skifte til %s" @@ -2400,7 +2400,7 @@ msgstr "Listemappen %spartial mangler." msgid "Archive directory %spartial is missing." msgstr "Arkivmappen %spartial mangler." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "Henter fil %li ud af %li (%s tilbage)" @@ -2545,11 +2545,11 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret" msgid "rename failed, %s (%s -> %s)." msgstr "omdøbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2558,7 +2558,7 @@ 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2567,13 +2567,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "nødt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, 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/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Størrelsen stemmer ikke" diff --git a/po/de.po b/po/de.po index 2fba11000..a28e3d9ca 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@ -1528,7 +1528,7 @@ msgstr "Datei %s/%s überschreibt die Datei in Paket %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kann %s nicht lesen" @@ -1837,7 +1837,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -1970,78 +1970,78 @@ msgstr "Konnte keine Pipe für %s öffnen" msgid "Read error from %s process" msgstr "Lesefehler von Prozess %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Warte auf Kopfzeilen (header)" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Schlechte Kopfzeile" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Der http-Server sandte eine ungültige »Content-Length«-Kopfzeile" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Der http-Server sandte eine ungültige »Content-Range«-Kopfzeile" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Interner Fehler" @@ -2054,7 +2054,7 @@ msgstr "Kann eine leere Datei nicht mit mmap abbilden" msgid "Couldn't make mmap of %lu bytes" msgstr "Konnte kein mmap von %lu Bytes durchführen" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" @@ -2176,7 +2176,7 @@ msgstr "Ungültige Operation %s." msgid "Unable to stat the mount point %s" msgstr "Kann auf den Einhängepunkt %s nicht zugreifen." -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kann nicht nach %s wechseln" @@ -2440,7 +2440,7 @@ msgstr "Listenverzeichnis %spartial fehlt." msgid "Archive directory %spartial is missing." msgstr "Archivverzeichnis %spartial fehlt." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2597,11 +2597,11 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches" msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2610,7 +2610,7 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2619,14 +2619,14 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Größe stimmt nicht" diff --git a/po/el.po b/po/el.po index 3f0b4ac9f..91b6a09f5 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: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-07-14 14:25EEST\n" "Last-Translator: Greek Translation Team \n" @@ -1528,7 +1528,7 @@ msgstr "Το αÏχείο %s/%s αντικαθιστά αυτό στο πακέ #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "ΑδÏνατη η ανάγνωση του %s" @@ -1832,7 +1832,7 @@ msgstr "Λήξη χÏόνου σÏνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "ΑδÏνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ΠÏόβλημα κατά το hashing του αÏχείου" @@ -1964,77 +1964,77 @@ msgstr "ΑδÏνατο το άνοιγμα διασωλήνωσης για το msgid "Read error from %s process" msgstr "Σφάλμα ανάγνωσης από τη διεÏγασία %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Αναμονή επικεφαλίδων" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Λήψη μίας και μόνης γÏαμμής επικεφαλίδας πάνω από %u χαÏακτήÏες" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Ελαττωματική γÏαμμή επικεφαλίδας" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Ο διακομιστής http έστειλε μια άκυÏη επικεφαλίδα απάντησης" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Ο διακομιστής http έστειλε μια άκυÏη επικεφαλίδα Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Ο διακομιστής http έστειλε μια άκυÏη επικεφαλίδα Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Ο διακομιστής http δεν υποστηÏίζει πλήÏως το range" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Άγνωστη μοÏφή ημεÏομηνίας" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Λήξη χÏόνου σÏνδεσης" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο εξόδου" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκÏο έκλεισε τη σÏνδεση" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Η σÏνδεση απέτυχε" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "ΕσωτεÏικό Σφάλμα" @@ -2047,7 +2047,7 @@ msgstr "ΑδÏνατο η απεικόνιση mmap ενός άδειου αÏχ msgid "Couldn't make mmap of %lu bytes" msgstr "ΑδÏνατη η απεικόνιση μέσω mmap %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Η επιλογή %s δε βÏέθηκε" @@ -2170,7 +2170,7 @@ msgstr "Μη έγκυÏη λειτουÏγία %s" msgid "Unable to stat the mount point %s" msgstr "ΑδÏνατη η εÏÏεση της κατάστασης του σημείου επαφής %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "ΑδÏνατη η αλλαγή σε %s" @@ -2437,7 +2437,7 @@ msgstr "Ο φάκελος λιστών %spartial αγνοείται." msgid "Archive directory %spartial is missing." msgstr "Ο φάκελος αÏχειοθηκών %spartial αγνοείται." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2589,11 +2589,11 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2602,7 +2602,7 @@ msgstr "" "ΑδÏνατος ο εντοπισμός ενός αÏχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χÏειάζεται να διοÏθώσετε χειÏοκίνητα το πακέτο. (λόγω χαμένου αÏχείου)" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2611,7 +2611,7 @@ msgstr "" "ΑδÏνατος ο εντοπισμός ενός αÏχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χÏειάζεται να διοÏθώσετε χειÏοκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2619,7 +2619,7 @@ msgstr "" "ΚατεστÏαμμένα αÏχεία ευÏετηÏίου πακέτων. Δεν υπάÏχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" diff --git a/po/en_GB.po b/po/en_GB.po index fce5ac0f2..a8fee4742 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@ -1365,7 +1365,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -1663,7 +1663,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1794,76 +1794,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "" @@ -1876,7 +1876,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "" @@ -1997,7 +1997,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2253,7 +2253,7 @@ msgstr "" msgid "Archive directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2399,31 +2399,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "" diff --git a/po/es.po b/po/es.po index 30d9f3109..fcc69804c 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: Spanish \n" @@ -1518,7 +1518,7 @@ msgstr "El archivo %s/%s sobreescribe al que est #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" @@ -1822,7 +1822,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1954,76 +1954,76 @@ msgstr "No pude abrir una tuber msgid "Read error from %s process" msgstr "Error de lectura de %s procesos" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Esperando las cabeceras" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Mala línea de cabecera" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor de http envió una cabecera de respuesta inválida" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor de http envió una cabecera de Content-Length inválida" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor de http envió una cabecera de Content-Range inválida" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Éste servidor de http tiene el soporte de alcance roto" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Falló la selección" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Expiró la conexión" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Error interno" @@ -2036,7 +2036,7 @@ msgstr "No puedo hacer mmap de un fichero vac msgid "Couldn't make mmap of %lu bytes" msgstr "No pude hacer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Selección %s no encontrada" @@ -2161,7 +2161,7 @@ msgstr "Operaci 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:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "No se pudo cambiar a %s" @@ -2427,7 +2427,7 @@ msgstr "Falta el directorio de listas %spartial." msgid "Archive directory %spartial is missing." msgstr "Falta el directorio de archivos %spartial." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2581,11 +2581,11 @@ msgstr "Error de E/S guardando cach msgid "rename failed, %s (%s -> %s)." msgstr "falló el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2595,7 +2595,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2604,7 +2604,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2612,7 +2612,7 @@ msgstr "" "Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "El tamaño difiere" diff --git a/po/eu.po b/po/eu.po index 87a8d212d..42fcecc3b 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: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-11-07 22:37+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale.org \n" @@ -1495,7 +1495,7 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" @@ -1802,7 +1802,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1935,76 +1935,76 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki" msgid "Read error from %s process" msgstr "Irakurri errorea %s prozesutik" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Okerreko goiburu-lerroa" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du." -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Datu-formatu ezezaguna" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Konexioaren denbora-muga gainditu da" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Barne-errorea" @@ -2017,7 +2017,7 @@ msgstr "Ezin da fitxategi huts baten mmap egin" msgid "Couldn't make mmap of %lu bytes" msgstr "Ezin izan da %lu byteren mmap egin" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" @@ -2139,7 +2139,7 @@ msgstr "Eragiketa baliogabea: %s" msgid "Unable to stat the mount point %s" msgstr "Ezin da atzitu %s muntatze-puntua" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ezin da %s(e)ra aldatu" @@ -2405,7 +2405,7 @@ msgstr "%spartial zerrenda-direktorioa falta da." msgid "Archive directory %spartial is missing." msgstr "%spartial artxibo-direktorioa falta da." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "%li fitxategi deskargatzen %li -fitxategitik (%s falta da)" @@ -2548,11 +2548,11 @@ msgstr "S/I errorea iturburu-cachea gordetzean" msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2561,7 +2561,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2570,7 +2570,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2578,7 +2578,7 @@ msgstr "" "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Tamaina ez dator bat" diff --git a/po/fi.po b/po/fi.po index 3b283058e..2388bf637 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: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -1501,7 +1501,7 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" @@ -1804,7 +1804,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1936,76 +1936,76 @@ msgstr "Putkea %s ei voitu avata" msgid "Read error from %s process" msgstr "Prosessi %s ilmoitti lukuvirheestä" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Odotetaan otsikoita" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Virheellinen otsikkorivi" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "HTTP-palvelimen arvoaluetuki on rikki" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2018,7 +2018,7 @@ msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" msgid "Couldn't make mmap of %lu bytes" msgstr "Ei voitu tehdä %lu tavun mmap:ia" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" @@ -2139,7 +2139,7 @@ msgstr "Virheellinen toiminto %s" msgid "Unable to stat the mount point %s" msgstr "Komento stat ei toiminut liitoskohdalle %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kansioon %s vaihto ei onnistu" @@ -2400,7 +2400,7 @@ msgstr "Luettelokansio %spartial puuttuu." msgid "Archive directory %spartial is missing." msgstr "Arkistokansio %spartial puuttuu." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2548,11 +2548,11 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2561,7 +2561,7 @@ 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2570,7 +2570,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2578,7 +2578,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Koko ei täsmää" diff --git a/po/fr.po b/po/fr.po index 77674c048..f37e66292 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-11-01 18:16+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -1527,7 +1527,7 @@ msgstr "Le fichier %s/%s #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" @@ -1836,7 +1836,7 @@ msgstr "D msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" @@ -1973,76 +1973,76 @@ msgstr "Ne parvient pas msgid "Read error from %s process" msgstr "Erreur de lecture du processus %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tête" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tête" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 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/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possède un support des limites non-valide" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:836 +#: methods/http.cc:873 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:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Erreur interne" @@ -2055,7 +2055,7 @@ msgstr "Impossible de mapper un fichier vide en m msgid "Couldn't make mmap of %lu bytes" msgstr "Impossible de réaliser un mapping de %lu octets en mémoire" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "La sélection %s n'a pu être trouvée" @@ -2178,7 +2178,7 @@ msgstr "L'op msgid "Unable to stat the mount point %s" msgstr "Impossible de localiser le point de montage %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossible d'accéder à %s" @@ -2448,7 +2448,7 @@ msgstr "Le r msgid "Archive directory %spartial is missing." msgstr "Le répertoire d'archive %spartial n'existe pas." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "Téléchargement du fichier %li de %li (%s restant)" @@ -2606,11 +2606,11 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2620,7 +2620,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2629,7 +2629,7 @@ msgstr "" "Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " "que vous devrez corriger manuellement ce paquet." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2637,7 +2637,7 @@ msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Taille incohérente" diff --git a/po/he.po b/po/he.po index 1dd3d862f..07848e46a 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -1320,7 +1320,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "" @@ -1616,7 +1616,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1747,76 +1747,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "" @@ -1829,7 +1829,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "" @@ -1950,7 +1950,7 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2206,7 +2206,7 @@ msgstr "" msgid "Archive directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2349,31 +2349,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "" diff --git a/po/hu.po b/po/hu.po index aa5d337bf..731863ed4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -1504,7 +1504,7 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levÅ‘t" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "A(z) %s nem olvasható" @@ -1811,7 +1811,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az idÅ‘keretet" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1943,76 +1943,76 @@ msgstr "Nem lehet csövet nyitni ehhez: %s" msgid "Read error from %s process" msgstr "Olvasási hiba a(z) %s folyamattól" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Várakozás a fejlécekre" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Rossz fejléc sor" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Ez a http szerver támogatja a sérült tartományokat " -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "IdÅ‘túllépés a kapcsolatban" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:836 +#: methods/http.cc:873 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:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Kapcsolódás sikertelen" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "BelsÅ‘ hiba" @@ -2026,7 +2026,7 @@ msgstr "Nem lehet mmap-olni egy üres fájlt" msgid "Couldn't make mmap of %lu bytes" msgstr "Nem sikerült %lu bájtot mmap-olni" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "A(z) %s kiválasztás nem található" @@ -2148,7 +2148,7 @@ msgstr "%s érvénytelen művelet" msgid "Unable to stat the mount point %s" msgstr "%s csatlakoztatási pont nem érhetÅ‘ el" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nem sikerült a következÅ‘re váltani: %s" @@ -2411,7 +2411,7 @@ msgstr "%spartial listakönyvtár hiányzik." msgid "Archive directory %spartial is missing." msgstr "%spartial archívumkönyvtár hiányzik." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2564,11 +2564,11 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor" msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelÅ‘" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2577,7 +2577,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2586,14 +2586,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mezÅ‘ a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "A méret nem megfelelÅ‘" diff --git a/po/it.po b/po/it.po index 59a78c681..7aeeec87b 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-10-05 17:38+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -1515,7 +1515,7 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" @@ -1818,7 +1818,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1954,77 +1954,77 @@ msgstr "Impossibile aprire una pipe per %s" msgid "Read error from %s process" msgstr "Errore di lettura dal processo %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Si è ottenuto una singola linea di header su %u caratteri" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Linea nell'header non corretta" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Il server HTTP ha inviato un header di risposta non valido" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Il server HTTP ha inviato un Content-Length non valido" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Il server HTTP ha inviato un Content-Range non valido" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha il supporto del range bacato" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Errore interno" @@ -2037,7 +2037,7 @@ msgstr "Impossibile eseguire mmap su un file vuoto" msgid "Couldn't make mmap of %lu bytes" msgstr "Impossibile eseguire mmap di %lu byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Selezione %s non trovata" @@ -2162,7 +2162,7 @@ msgstr "Operazione non valida %s" msgid "Unable to stat the mount point %s" msgstr "Impossibile accedere al mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossibile raggiungere %s" @@ -2426,7 +2426,7 @@ msgstr "Manca la directory di liste %spartial." msgid "Archive directory %spartial is missing." msgstr "Manca la directory di archivio %spartial." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "Scaricamento del file %li di %li (%s rimanente)" @@ -2579,11 +2579,11 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente" msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2593,7 +2593,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2602,7 +2602,7 @@ msgstr "" "Non è stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2610,7 +2610,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c'è un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" diff --git a/po/ja.po b/po/ja.po index a7083728c..2feec2ce8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-09 12:54+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -1510,7 +1510,7 @@ msgstr " #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s ¤òÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" @@ -1814,7 +1814,7 @@ msgstr " msgid "Unable to accept connection" msgstr "Àܳ¤ò accept ¤Ç¤­¤Þ¤»¤ó" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤Ç¤ÎÌäÂê" @@ -1946,76 +1946,76 @@ msgstr "%s msgid "Read error from %s process" msgstr "%s ¥×¥í¥»¥¹¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "¥Ø¥Ã¥À¤ÎÂÔµ¡Ãæ¤Ç¤¹" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "%u ʸ»ú¤ò±Û¤¨¤ë 1 ¹Ô¤Î¥Ø¥Ã¥À¤ò¼èÆÀ¤·¤Þ¤·¤¿" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥À¹Ô¤Ç¤¹" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "http ¥µ¡¼¥Ð¤¬ÉÔÀµ¤Ê¥ê¥×¥é¥¤¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¤­¤Þ¤·¤¿" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http ¥µ¡¼¥Ð¤¬ÉÔÀµ¤Ê Content-Length ¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¤­¤Þ¤·¤¿" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http ¥µ¡¼¥Ð¤¬ÉÔÀµ¤Ê Content-Range ¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¤­¤Þ¤·¤¿" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "http ¥µ¡¼¥Ð¤Î¥ì¥ó¥¸¥µ¥Ý¡¼¥È¤¬²õ¤ì¤Æ¤¤¤Þ¤¹" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "ÉÔÌÀ¤ÊÆüÉÕ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç¤¹" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "select ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Àܳ¥¿¥¤¥à¥¢¥¦¥È" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "¥ê¥â¡¼¥È¦¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Æ¥µ¡¼¥Ð¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "¥µ¡¼¥Ð¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥À¤Ç¤¹" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Àܳ¼ºÇÔ" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "ÆâÉô¥¨¥é¡¼" @@ -2028,7 +2028,7 @@ msgstr " msgid "Couldn't make mmap of %lu bytes" msgstr "%lu ¥Ð¥¤¥È¤Î mmap ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "ÁªÂò¤µ¤ì¤¿ %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" @@ -2149,7 +2149,7 @@ msgstr " msgid "Unable to stat the mount point %s" msgstr "¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È %s ¤ò stat ¤Ç¤­¤Þ¤»¤ó" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "%s ¤ØÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" @@ -2412,7 +2412,7 @@ msgstr " msgid "Archive directory %spartial is missing." msgstr "¥¢¡¼¥«¥¤¥Ö¥Ç¥£¥ì¥¯¥È¥ê %spartial ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£" -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2564,11 +2564,11 @@ msgstr " msgid "rename failed, %s (%s -> %s)." msgstr "¥ê¥Í¡¼¥à¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5Sum ¤¬Å¬¹ç¤·¤Þ¤»¤ó" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2577,7 +2577,7 @@ msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°" "¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹ (¸ºß¤·¤Ê¤¤¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¤¿¤á)¡£" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2586,7 +2586,7 @@ msgstr "" "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤³¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°" "¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£" -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2594,7 +2594,7 @@ msgstr "" "¥Ñ¥Ã¥±¡¼¥¸¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ë Filename: " "¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£" -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "¥µ¥¤¥º¤¬Å¬¹ç¤·¤Þ¤»¤ó" diff --git a/po/ko.po b/po/ko.po index 9089557f1..23827460b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -1500,7 +1500,7 @@ msgstr "%s/%s 파ì¼ì€ %s ê¾¸ëŸ¬ë¯¸ì— ìžˆëŠ” 파ì¼ì„ ë®ì–´ ì”니다" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%sì„(를) ì½ì„ 수 없습니다" @@ -1802,7 +1802,7 @@ msgstr "ë°ì´í„° 소켓 ì—°ê²° 시간 초과" msgid "Unable to accept connection" msgstr "ì—°ê²°ì„ ë°›ì„ ìˆ˜ 없습니다" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "íŒŒì¼ í•´ì‹±ì— ë¬¸ì œê°€ 있습니다" @@ -1934,76 +1934,76 @@ msgstr "%sì— ëŒ€í•œ 파ì´í”„를 ì—´ 수 없습니다" msgid "Read error from %s process" msgstr "%s 프로세스ì—ì„œ ì½ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "í—¤ë”를 기다리는 중입니다" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "í—¤ë” í•œ ì¤„ì— %u개가 넘는 문ìžê°€ 들어 있습니다" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "í—¤ë” ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ ì‘답 í—¤ë”를 보냈습니다" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ Content-Length í—¤ë”를 보냈습니다" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ Content-Range í—¤ë”를 보냈습니다" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "HTTP ì„œë²„ì— ë²”ìœ„ ì§€ì› ê¸°ëŠ¥ì´ ìž˜ëª»ë˜ì–´ 있습니다" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "ë°ì´í„° 형ì‹ì„ ì•Œ 수 없습니다" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "selectê°€ 실패했습니다" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "ì—°ê²° ì‹œê°„ì´ ì´ˆê³¼í–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "출력 파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "해당 파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "서버ì—ì„œ ì½ê³  ì—°ê²°ì„ ë‹«ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "서버ì—ì„œ ì½ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "í—¤ë” ë°ì´í„°ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "ì—°ê²°ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "내부 오류" @@ -2016,7 +2016,7 @@ msgstr "빈 파ì¼ì— mmapí•  수 없습니다" msgid "Couldn't make mmap of %lu bytes" msgstr "%luë°”ì´íŠ¸ë¥¼ mmapí•  수 없습니다" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "ì„ íƒí•œ %sì´(ê°€) 없습니다" @@ -2137,7 +2137,7 @@ msgstr "ìž˜ëª»ëœ ìž‘ì—… %s" msgid "Unable to stat the mount point %s" msgstr "마운트 위치 %sì˜ ì •ë³´ë¥¼ ì½ì„ 수 없습니다" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "%s 디렉토리로 ì´ë™í•  수 없습니다" @@ -2399,7 +2399,7 @@ msgstr "ëª©ë¡ ë””ë ‰í† ë¦¬ %spartialì´ ë¹ ì¡ŒìŠµë‹ˆë‹¤." msgid "Archive directory %spartial is missing." msgstr "ì•„ì¹´ì´ë¸Œ 디렉토리 %spartialì´ ë¹ ì¡ŒìŠµë‹ˆë‹¤." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2545,11 +2545,11 @@ msgstr "소스 ìºì‹œë¥¼ 저장하는 ë° ìž…ì¶œë ¥ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤ msgid "rename failed, %s (%s -> %s)." msgstr "ì´ë¦„ 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5Sumì´ ë§žì§€ 않습니다" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2558,7 +2558,7 @@ msgstr "" "%s ê¾¸ëŸ¬ë¯¸ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ ê³ ì³ì•¼ í•  ìˆ˜ë„ ìžˆìŠµ" "니다. (아키í…ì³ê°€ 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2567,14 +2567,14 @@ msgstr "" "%s ê¾¸ëŸ¬ë¯¸ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ ê³ ì³ì•¼ í•  ìˆ˜ë„ ìžˆìŠµ" "니다." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 ì¸ë±ìŠ¤ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤. %s ê¾¸ëŸ¬ë¯¸ì— Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "í¬ê¸°ê°€ 맞지 않습니다" diff --git a/po/nb.po b/po/nb.po index 177633cc6..34cfc1d6e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -1516,7 +1516,7 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke å lese %s" @@ -1823,7 +1823,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@ -1955,76 +1955,76 @@ msgstr "Klarte ikke msgid "Read error from %s process" msgstr "Lesefeil fra %s-prosessen" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Venter på hoder" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Fikk en enkel hodelinje over %u tegn" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Ødelagt hodelinje" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tjeneren sendte et ugyldig svarhode" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tjeneren har ødelagt støtte for område" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Tidsavbrudd på forbindelsen" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Intern feil" @@ -2037,7 +2037,7 @@ msgstr "Kan ikke utf msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke lage mmap av %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" @@ -2158,7 +2158,7 @@ msgstr "Ugyldig operasjon %s" msgid "Unable to stat the mount point %s" msgstr "Klarer ikke å fastsette monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Klarer ikke å endre %s" @@ -2420,7 +2420,7 @@ msgstr "Listemappa %spartial mangler." msgid "Archive directory %spartial is missing." msgstr "Arkivmappa %spartial mangler." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2568,11 +2568,11 @@ msgstr "IO-feil ved lagring av kildekode-lager" msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke å endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2581,7 +2581,7 @@ 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2590,13 +2590,13 @@ msgstr "" "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, 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/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Feil størrelse" diff --git a/po/nl.po b/po/nl.po index ba3334d41..3dc814ea2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@ -1524,7 +1524,7 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" @@ -1831,7 +1831,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1963,79 +1963,79 @@ msgstr "Kon geen pijp openen voor %s" msgid "Read error from %s process" msgstr "Leesfout door proces %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Wachtend op de kopteksten" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Foute koptekstregel" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:836 +#: methods/http.cc:873 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:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Interne fout" @@ -2048,7 +2048,7 @@ msgstr "Kan een leeg bestand niet mmappen" msgid "Couldn't make mmap of %lu bytes" msgstr "Kon van %lu bytes geen mmap maken" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" @@ -2173,7 +2173,7 @@ msgstr "Ongeldige operatie %s" msgid "Unable to stat the mount point %s" msgstr "Kan de status van het aanhechtpunt %s niet opvragen" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kan %s niet veranderen" @@ -2440,7 +2440,7 @@ msgstr "Lijstmap %spartial is afwezig." msgid "Archive directory %spartial is missing." msgstr "Archiefmap %spartial is afwezig." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2592,11 +2592,11 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2605,7 +2605,7 @@ 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2614,7 +2614,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2622,7 +2622,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Grootte komt niet overeen" diff --git a/po/nn.po b/po/nn.po index 04bda23d4..f57bba2af 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: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Håvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -1500,7 +1500,7 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" @@ -1806,7 +1806,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@ -1938,76 +1938,76 @@ msgstr "Klarte ikkje opna r msgid "Read error from %s process" msgstr "Lesefeil frå %s-prosessen" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Ventar på hovud" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Fekk ei enkel hovudlinje over %u teikn" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Øydelagd hovudlinje" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tenaren sende eit ugyldig svarhovud" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tenaren har øydelagd støtte for område" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Tidsavbrot på sambandet" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Feil ved lesing frå tenaren" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Øydelagde hovuddata" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Intern feil" @@ -2020,7 +2020,7 @@ msgstr "Kan ikkje utf msgid "Couldn't make mmap of %lu bytes" msgstr "Klarte ikkje laga mmap av %lu byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" @@ -2141,7 +2141,7 @@ msgstr "Ugyldig operasjon %s" msgid "Unable to stat the mount point %s" msgstr "Klarte ikkje få status til monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Klarte ikkje byta til %s" @@ -2404,7 +2404,7 @@ msgstr "Listekatalogen %spartial manglar." msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial manglar." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2551,11 +2551,11 @@ msgstr "IU-feil ved lagring av kjeldelager" msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2564,7 +2564,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2572,14 +2572,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, 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/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Feil storleik" diff --git a/po/pl.po b/po/pl.po index db724a2ac..54e94c641 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@ -1512,7 +1512,7 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nie mo¿na czytaæ %s" @@ -1816,7 +1816,7 @@ msgstr "Przekroczony czas po msgid "Unable to accept connection" msgstr "Nie uda³o siê przyj±æ po³±czenia" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie uda³o siê obliczyæ skrótu pliku" @@ -1948,76 +1948,76 @@ msgstr "Nie uda msgid "Read error from %s process" msgstr "B³±d odczytu z procesu %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Oczekiwanie na nag³ówki" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Otrzymano pojedyncz± liniê nag³ówka o d³ugo¶ci ponad %u znaków" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Nieprawid³owa linia nag³ówka" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek odpowiedzi" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Ten serwer HTTP nieprawid³owo obs³uguje zakresy (ranges)" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Operacja select nie powiod³a siê" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Przekroczenie czasu po³±czenia" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "B³±d przy pisaniu do pliku wyj¶ciowego" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "B³±d przy pisaniu do pliku" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "B³±d przy pisaniu do pliku" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "B³±d czytania z serwera: Zdalna strona zamknê³a po³±czenie" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "B³±d czytania z serwera" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "B³êdne dane nag³ówka" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Po³±czenie nie uda³o siê" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "B³±d wewnêtrzny" @@ -2030,7 +2030,7 @@ msgstr "Nie mo msgid "Couldn't make mmap of %lu bytes" msgstr "Nie uda³o siê wykonaæ mmap %lu bajtów" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" @@ -2152,7 +2152,7 @@ msgstr "Nieprawid 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:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nie uda³o siê przej¶æ do %s" @@ -2415,7 +2415,7 @@ msgstr "Brakuje katalogu list %spartial." msgid "Archive directory %spartial is missing." msgstr "Brakuje katalogu archiwów %spartial." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2566,11 +2566,11 @@ msgstr "B msgid "rename failed, %s (%s -> %s)." msgstr "nie uda³o siê zmieniæ nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "B³êdna suma MD5" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2579,7 +2579,7 @@ 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2588,14 +2588,14 @@ msgstr "" "Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba " "bêdzie rêcznie naprawiæ ten pakiet." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, 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/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "B³êdny rozmiar" diff --git a/po/pt.po b/po/pt.po index 78f5556fb..af44e7f15 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -1510,7 +1510,7 @@ msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@ -1813,7 +1813,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@ -1945,76 +1945,76 @@ msgstr "Não foi possível abrir pipe para %s" msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Linha de cabeçalho errada" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor http enviou um cabeçalho de resposta inválido" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor http enviou um cabeçalho Conten-Length inválido" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor http enviou um cabeçalho Conten-Range inválido" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Este servidor http possui suporte a range errado" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligação" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Erro interno" @@ -2027,7 +2027,7 @@ msgstr "Não é possível fazer mmap a um ficheiro vazio" msgid "Couldn't make mmap of %lu bytes" msgstr "Impossível fazer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Selecção %s não encontrada" @@ -2150,7 +2150,7 @@ msgstr "Operação %s inválida" msgid "Unable to stat the mount point %s" msgstr "Impossível executar stat ao ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@ -2414,7 +2414,7 @@ msgstr "Falta directório de listas %spartial." msgid "Archive directory %spartial is missing." msgstr "Falta o diretório de repositório %spartial." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2568,11 +2568,11 @@ msgstr "Erro de I/O ao gravar a cache de código fonte" msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2582,7 +2582,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2591,7 +2591,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2599,7 +2599,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Tamanho incorreto" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7706fb6fa..54946a2c4 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: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" @@ -1507,7 +1507,7 @@ msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@ -1813,7 +1813,7 @@ msgstr "Conex msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1945,76 +1945,76 @@ msgstr "N msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Linha de cabeçalho ruim" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor http enviou um cabeçalho de resposta inválido" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor http enviou um cabeçalho Conten-Length inválido" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor http enviou um cabeçalho Conten-Range inválido" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Este servidor http possui suporte a range quebrado" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Seleção falhou." -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de saída" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor Ponto remoto fechou a conexão" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Conexão falhou." -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Erro interno" @@ -2027,7 +2027,7 @@ msgstr "N msgid "Couldn't make mmap of %lu bytes" msgstr "Impossível fazer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Seleção %s não encontrada" @@ -2150,7 +2150,7 @@ msgstr "Opera msgid "Unable to stat the mount point %s" msgstr "Impossível checar o ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@ -2414,7 +2414,7 @@ msgstr "Diret msgid "Archive directory %spartial is missing." msgstr "Diretório de repositório %spartial está faltando." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2568,11 +2568,11 @@ msgstr "Erro de I/O ao gravar cache fonte" msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2582,7 +2582,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2591,7 +2591,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2599,7 +2599,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Tamanho incorreto" diff --git a/po/ro.po b/po/ro.po index 9a0d7213e..9497f70b2 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-08-25 17:43+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@ -1515,7 +1515,7 @@ msgstr "FiÅŸierul %s/%s suprascrie pe cel din pachetul %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Nu pot citi %s" @@ -1821,7 +1821,7 @@ msgstr "Timp de conectare data socket expirat" msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la indexarea fiÅŸierului" @@ -1953,77 +1953,77 @@ msgstr "Nu pot deschide conexiunea pentru %s" msgid "Read error from %s process" msgstr "Eroare de citire din procesul %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "ÃŽn aÅŸteptarea antetelor" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Primit o singură linie de antet peste %u caractere" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Linie de antet necorespunzătoare" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Serverul http a trimis un antet de răspuns necorespunzător" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serverul http a trimis un antet lungime-conÅ£inut necorespunzător" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serverul http a trimis un antet zonă de conÅ£inut necorespunzător" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Acest server http are zonă de suport necorespunzătoare" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "EÅŸuarea selecÅ£iei" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Eroare la scrierea fiÅŸierului de rezultat" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Eroare la scrierea în fiÅŸier" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Eroare la scrierea în fiÅŸierul" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Conectare eÅŸuată" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Eroare internă" @@ -2036,7 +2036,7 @@ msgstr "Nu pot mmap un fiÅŸier gol" msgid "Couldn't make mmap of %lu bytes" msgstr "Nu pot face mmap la %lu bytes" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "SelecÅ£ia %s nu s-a găsit" @@ -2159,7 +2159,7 @@ msgstr "OperaÅ£iune invalidă %s" msgid "Unable to stat the mount point %s" msgstr "Nu pot determina starea punctului de montare %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nu pot schimba la %s" @@ -2422,7 +2422,7 @@ msgstr "Directorul de liste %spartial lipseÅŸte." msgid "Archive directory %spartial is missing." msgstr "Directorul de arhive %spartial lipseÅŸte." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2576,11 +2576,11 @@ msgstr "Eroare IO în timpul salvării sursei cache" msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eÅŸuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2589,7 +2589,7 @@ 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2598,7 +2598,7 @@ msgstr "" "N-am putut localiza un fiÅŸier pentru pachetul %s. Aceasta ar putea însemna " "că aveÅ£i nevoie să depanaÅ£i manual acest pachet." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2606,7 +2606,7 @@ msgstr "" "FiÅŸierele index de pachete sunt deteriorate. Fără câmpul 'nume fiÅŸier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" diff --git a/po/ru.po b/po/ru.po index ca3447a91..a9921de46 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-10-22 12:24+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -1528,7 +1528,7 @@ msgstr "Файл %s/%s перепиÑывает файл в пакете %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ðевозможно прочитать %s" @@ -1833,7 +1833,7 @@ msgstr "Ð’Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñоке msgid "Unable to accept connection" msgstr "Ðевозможно принÑÑ‚ÑŒ Ñоединение" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при Ñ…Ñшировании файла" @@ -1969,76 +1969,76 @@ msgstr "Ðе удалоÑÑŒ открыть канал Ð´Ð»Ñ %s" msgid "Read error from %s process" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð· процеÑÑа %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен заголовок длиннее %u Ñимволов" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Ðеверный заголовок" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Http-Ñервер поÑлал неверный заголовок" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http Ñервер поÑлал неверный заголовок Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-Ñервер поÑлал неверный заголовок Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Этот http-Ñервер не поддерживает загрузку фрагментов файлов" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "ÐеизвеÑтный формат данных" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¸Ñтекло" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Ошибка запиÑи в выходной файл" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Ошибка запиÑи в файл" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Ошибка запиÑи в файл" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтениÑ, удалённый Ñервер прервал Ñоединение" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ Ñервера" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Ðеверный заголовок данных" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°" @@ -2051,7 +2051,7 @@ msgstr "Ðевозможно отобразить в памÑÑ‚ÑŒ пуÑтой msgid "Couldn't make mmap of %lu bytes" msgstr "Ðевозможно отобразить в памÑÑ‚ÑŒ %lu байт" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Ðе найдено: %s" @@ -2174,7 +2174,7 @@ msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ %s" msgid "Unable to stat the mount point %s" msgstr "Ðевозможно прочитать атрибуты точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ðевозможно Ñменить текущий каталог на %s" @@ -2443,7 +2443,7 @@ msgstr "Каталог %spartial отÑутÑтвует." msgid "Archive directory %spartial is missing." msgstr "Ðрхивный каталог %spartial отÑутÑтвует." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "ЗагружаетÑÑ Ñ„Ð°Ð¹Ð» %li из %li (%s оÑталоÑÑŒ)" @@ -2586,11 +2586,11 @@ msgstr "Ошибка ввода/вывода при попытке Ñохран msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалоÑÑŒ, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5Sum не Ñовпадает" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2599,7 +2599,7 @@ msgstr "" "Я не в ÑоÑтоÑнии обнаружить файл пакета %s. Это может означать, что Вам " "придётÑÑ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ иÑправить Ñтот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2608,13 +2608,13 @@ msgstr "" "Я не в ÑоÑтоÑнии обнаружить файл пакета %s. Это может означать, что Вам " "придётÑÑ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ иÑправить Ñтот пакет." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Ðекорректный перечень пакетов. Ðет Ð¿Ð¾Ð»Ñ Filename: Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Ðе Ñовпадает размер" diff --git a/po/sk.po b/po/sk.po index aba3b462a..451d2379e 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-07-01 09:34+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@ -1493,7 +1493,7 @@ msgstr "Súbor %s/%s prepisuje ten z balíka %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "%s sa nedá ÄítaÅ¥" @@ -1797,7 +1797,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijaÅ¥" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@ -1929,76 +1929,76 @@ msgstr "Nedá sa otvoriÅ¥ rúra pre %s" msgid "Read error from %s process" msgstr "Chyba pri Äítaní z procesu %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "ÄŒaká sa na hlaviÄky" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal sa jeden riadok hlaviÄky cez %u znakov" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Chybná hlaviÄka" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnú hlaviÄku odpovede" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnú hlaviÄku Content-Length" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnú hlaviÄku Content-Range" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poÅ¡kodenú podporu rozsahov" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Uplynul Äas spojenia" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri Äítaní zo servera. Druhá strana ukonÄila spojenie" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Chyba pri Äítaní zo servera" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Vnútorná chyba" @@ -2011,7 +2011,7 @@ msgstr "Nedá sa vykonaÅ¥ mmap prázdneho súboru" msgid "Couldn't make mmap of %lu bytes" msgstr "Nedá sa urobiÅ¥ mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Voľba %s nenájdená" @@ -2133,7 +2133,7 @@ msgstr "Neplatná operácia %s" msgid "Unable to stat the mount point %s" msgstr "Prípojný bod %s sa nedá vyhodnotiÅ¥" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Nedá sa prejsÅ¥ do %s" @@ -2394,7 +2394,7 @@ msgstr "Adresár zoznamov %spartial chýba." msgid "Archive directory %spartial is missing." msgstr "Archívny adresár %spartial chýba." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2542,11 +2542,11 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súÄtov" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2555,7 +2555,7 @@ 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2564,13 +2564,13 @@ msgstr "" "Nedá sa nájsÅ¥ súbor s balíkom %s. Asi budete musieÅ¥ opraviÅ¥ tento balík " "manuálne." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, 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/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" diff --git a/po/sl.po b/po/sl.po index 7d8e4afb3..92fbaaa4a 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: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Èuhalev \n" "Language-Team: Slovenian \n" @@ -1494,7 +1494,7 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Ni mogoèe brati %s" @@ -1796,7 +1796,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoèe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Te¾ava pri razpr¹evanju datoteke" @@ -1928,76 +1928,76 @@ msgstr "Ni mogo msgid "Read error from %s process" msgstr "Napaka pri branju iz procesa %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Èakanje na glave" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Dobljena je ena vrstica glave preko %u znakov" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Napaèna vrstica glave" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Stre¾nik HTTP je poslal napaèno glavo odgovora" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Stre¾nik HTTP je poslal glavo z napaèno dol¾ino vsebine" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Stre¾nik HTTP je poslal glavo z napaènim obsegom vsebine" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Ta stre¾nik HTTP ima pokvarjen obseg podpore" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Èas za povezavo se je iztekel" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika " -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Napaka pri branju s stre¾nika" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Napaèni podatki glave" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Notranja napaka" @@ -2010,7 +2010,7 @@ msgstr "mmap prazne datoteke ni mogo msgid "Couldn't make mmap of %lu bytes" msgstr "Ni mogoèe narediti mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Izbira %s ni mogoèe najti" @@ -2132,7 +2132,7 @@ msgstr "Napa msgid "Unable to stat the mount point %s" msgstr "Ni mogoèe doloèiti priklopne toèke %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Ni mogoèe spremeniti v %s" @@ -2394,7 +2394,7 @@ msgstr "Manjka imenik s seznami %spartial." msgid "Archive directory %spartial is missing." msgstr "Manjka imenik z arhivi %spartial." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2540,11 +2540,11 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov" msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2553,7 +2553,7 @@ 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2562,7 +2562,7 @@ msgstr "" "Ni bilo mogoèe najti datoteke za paket %s. Morda boste morali roèno " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2570,7 +2570,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Neujemanje velikosti" diff --git a/po/sv.po b/po/sv.po index 0f46a5a34..b0d1e03ac 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-11-02 23:56+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -1506,7 +1506,7 @@ msgstr "Filen %s/%s skriver #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Kunde inte läsa %s" @@ -1809,7 +1809,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -1947,76 +1947,76 @@ msgstr "Kunde inte msgid "Read error from %s process" msgstr "Läsfel på %s-processen" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Väntar på huvuden" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Fick en ensam huvudrad på %u tecken" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Trasig huvudrad" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern sände ett ogiltigt svarshuvud" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http-servern sände ett ogiltigt Content-Length-huvud" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-servern sände ett ogiltigt Content-Range-huvud" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Denna http-servers stöd för delvis hämtning fungerar inte" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Tidsgränsen för anslutningen nåddes" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:836 +#: methods/http.cc:873 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:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Internt fel" @@ -2029,7 +2029,7 @@ msgstr "Kan inte utf msgid "Couldn't make mmap of %lu bytes" msgstr "Kunde inte utföra mmap på %lu byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Valet %s ej funnet" @@ -2151,7 +2151,7 @@ msgid "Unable to stat the mount point %s" msgstr "Kunde inte ta status på monteringspunkt %s." # Felmeddelande för misslyckad chdir -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Kunde inte gå till %s" @@ -2417,7 +2417,7 @@ msgstr "Listkatalogen %spartial saknas." msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial saknas." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "Laddar ner fil %li av %li (%s återstår)" @@ -2564,11 +2564,11 @@ msgstr "In-/utfel vid lagring av k msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stämmer inte" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2577,7 +2577,7 @@ msgstr "" "Jag kunde inte lokalisera 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2586,13 +2586,13 @@ msgstr "" "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är trasiga. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Storleken stämmer inte" diff --git a/po/tl.po b/po/tl.po index fb3260c88..18f664faf 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-11-03 03:35+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -1511,7 +1511,7 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" @@ -1814,7 +1814,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1950,76 +1950,76 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s" msgid "Read error from %s process" msgstr "Error sa pagbasa mula sa prosesong %s" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "Naghihintay ng mga header" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "Nakatanggap ng isang linyang header mula %u na mga karakter" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "Maling linyang header" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "Sira ang range support ng HTTP server na ito" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Maling datos sa header" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "Internal na error" @@ -2032,7 +2032,7 @@ msgstr "Hindi mai-mmap ang talaksang walang laman" msgid "Couldn't make mmap of %lu bytes" msgstr "Hindi makagawa ng mmap ng %lu na byte" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" @@ -2156,7 +2156,7 @@ msgstr "Di tanggap na operasyon %s" msgid "Unable to stat the mount point %s" msgstr "Di mai-stat ang mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "Di makalipat sa %s" @@ -2424,7 +2424,7 @@ msgstr "Nawawala ang directory ng talaan %spartial." msgid "Archive directory %spartial is missing." msgstr "Nawawala ang directory ng arkibo %spartial." -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" @@ -2573,11 +2573,11 @@ msgstr "IO Error sa pag-imbak ng source cache" msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2586,7 +2586,7 @@ 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:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2595,7 +2595,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2603,7 +2603,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "Di tugmang laki" diff --git a/po/zh_CN.po b/po/zh_CN.po index 53558bee7..6501190a1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-11-15 00:05+0800\n" "Last-Translator: Tchaikov \n" "Language-Team: Debian Chinese [GB] \n" @@ -1478,7 +1478,7 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的åŒå文件" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "æ— æ³•è¯»å– %s" @@ -1778,7 +1778,7 @@ msgstr "æ•°æ®å¥—接字连接超时" msgid "Unable to accept connection" msgstr "无法接å—连接" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1908,76 +1908,76 @@ msgstr "无法为 %s å¼€å¯ç®¡é“" msgid "Read error from %s process" msgstr "从 %s 进程读å–æ•°æ®å‡ºé”™" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "å—到了一行报头æ¡ç›®ï¼Œå®ƒçš„长度超过了 %u 个字符" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "错误的报头æ¡ç›®" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "该 http æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„应答报头" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 http æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„ Content-Length 报头" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 http æœåŠ¡å™¨å‘é€äº†ä¸€ä¸ªæ— æ•ˆçš„ Content-Range 报头" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "该 http æœåŠ¡å™¨çš„ range 支æŒä¸æ­£å¸¸" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "无法识别的日期格å¼" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "连接æœåŠ¡å™¨è¶…æ—¶" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "从æœåŠ¡å™¨è¯»å–æ•°æ®æ—¶å‡ºé”™ï¼Œå¯¹æ–¹å…³é—­äº†è¿žæŽ¥" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "从æœåŠ¡å™¨è¯»å–æ•°æ®å‡ºé”™" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "错误的报头数æ®" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "内部错误" @@ -1990,7 +1990,7 @@ msgstr "无法 mmap 一个空文件" msgid "Couldn't make mmap of %lu bytes" msgstr "无法 mmap %lu 字节的数æ®" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "没有å‘现您的所选 %s" @@ -2111,7 +2111,7 @@ msgstr "无效的æ“作 %s" msgid "Unable to stat the mount point %s" msgstr "无法读å–文件系统挂载点 %s 的状æ€" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "无法切æ¢å·¥ä½œç›®å½•åˆ° %s" @@ -2374,7 +2374,7 @@ msgstr "软件包列表的目录 %spartial ä¸è§äº†ã€‚" msgid "Archive directory %spartial is missing." msgstr "找ä¸åˆ°â€œ%spartialâ€è¿™ä¸ªç›®å½•ã€‚" -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "正在下载第 %li 个文件(å…± %li 个，尚需 %s)" @@ -2517,11 +2517,11 @@ msgstr "无法写入æ¥æºç¼“存文件" msgid "rename failed, %s (%s -> %s)." msgstr "无法é‡å‘½å文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5 校验和ä¸ç¬¦" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2530,7 +2530,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这ç§æƒ…况下å¯èƒ½éœ€è¦æ‚¨æ‰‹åŠ¨ä¿®æ­£è¿™ä¸ªè½¯ä»¶" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2538,13 +2538,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这ç§æƒ…况下您å¯èƒ½éœ€è¦æ‰‹åŠ¨ä¿®æ­£è¿™ä¸ªè½¯ä»¶åŒ…。" -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已æŸå。找ä¸åˆ°å¯¹åº”软件包 %s çš„ Filename: 字段。" -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "大å°ä¸ç¬¦" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6b87076f6..f405147f8 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: \n" -"POT-Creation-Date: 2005-11-22 11:23+0100\n" +"POT-Creation-Date: 2005-11-23 00:39+0100\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@ -1489,7 +1489,7 @@ msgstr "檔案 %s/%s 複寫套件 %s 中的相åŒæª”案" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" msgstr "無法讀å–『%sã€ã€‚" @@ -1789,7 +1789,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法å…許連線" -#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "å•é¡Œé›œæ¹Šè¡¨" @@ -1921,76 +1921,76 @@ msgstr "無法開啟管線給 %s 使用" msgid "Read error from %s process" msgstr "從 %s 進程讀å–錯誤" -#: methods/http.cc:344 +#: methods/http.cc:381 msgid "Waiting for headers" msgstr "等待標頭" -#: methods/http.cc:490 +#: methods/http.cc:527 #, c-format msgid "Got a single header line over %u chars" msgstr "å–å¾—ä¸€å€‹å–®è¡Œè¶…éŽ %u 字元的標頭" -#: methods/http.cc:498 +#: methods/http.cc:535 msgid "Bad header line" msgstr "壞的標頭" -#: methods/http.cc:517 methods/http.cc:524 +#: methods/http.cc:554 methods/http.cc:561 msgid "The HTTP server sent an invalid reply header" msgstr "http 伺æœå™¨å‚³é€ä¸€å€‹ç„¡æ•ˆçš„回覆標頭" -#: methods/http.cc:553 +#: methods/http.cc:590 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http 伺æœå™¨å‚³é€ä¸€å€‹ç„¡æ•ˆçš„ Content-Length 標頭" -#: methods/http.cc:568 +#: methods/http.cc:605 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http 伺æœå™¨å‚³é€ä¸€å€‹ç„¡æ•ˆçš„ Content-Range 標頭" -#: methods/http.cc:570 +#: methods/http.cc:607 msgid "This HTTP server has broken range support" msgstr "http 伺æœå™¨æœ‰æ毀的範åœæ”¯æ´" -#: methods/http.cc:594 +#: methods/http.cc:631 msgid "Unknown date format" msgstr "未知的資料格å¼" -#: methods/http.cc:741 +#: methods/http.cc:778 msgid "Select failed" msgstr "Select 失敗" -#: methods/http.cc:746 +#: methods/http.cc:783 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:769 +#: methods/http.cc:806 msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:797 +#: methods/http.cc:834 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:822 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:836 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "從é ç«¯ä¸»æ©Ÿè®€å–錯誤，關閉連線" -#: methods/http.cc:838 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "從伺æœå™¨è®€å–發生錯誤" -#: methods/http.cc:1069 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1086 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1177 +#: methods/http.cc:1214 msgid "Internal error" msgstr "內部錯誤" @@ -2003,7 +2003,7 @@ msgstr "ä¸èƒ½å°‡ç©ºç™½æª”案讀入記憶體" msgid "Couldn't make mmap of %lu bytes" msgstr "無法讀入檔案 %lu ä½å…ƒçµ„至記憶體" -#: apt-pkg/contrib/strutl.cc:941 +#: apt-pkg/contrib/strutl.cc:938 #, c-format msgid "Selection %s not found" msgstr "é¸é …『%sã€æ‰¾ä¸åˆ°ã€‚" @@ -2124,7 +2124,7 @@ msgstr "無效的æ“作：%s" msgid "Unable to stat the mount point %s" msgstr "無法讀å–掛載點 %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" msgstr "無法進入『%sã€ç›®éŒ„。" @@ -2382,7 +2382,7 @@ msgstr "找ä¸åˆ°ã€Ž%spartialã€æ¸…單目錄。" msgid "Archive directory %spartial is missing." msgstr "找ä¸åˆ°ã€Ž%spartialã€æª”案目錄。" -#: apt-pkg/acquire.cc:817 +#: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" msgstr "" @@ -2528,31 +2528,31 @@ msgstr "無法寫入來æºæš«å­˜æª”。" msgid "rename failed, %s (%s -> %s)." msgstr "檔å因『%sã€æ›´æ›å¤±æ•— (%s → %s)。" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:914 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼ä¸ç¬¦åˆã€‚" -#: apt-pkg/acquire-item.cc:722 +#: apt-pkg/acquire-item.cc:719 #, 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ã€éœ€è¦çš„æŸæª”案。請您修ç†é€™å€‹å¥—件å†è©¦è©¦ã€‚" -#: apt-pkg/acquire-item.cc:781 +#: apt-pkg/acquire-item.cc:778 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找ä¸åˆ°å¥—件『%sã€éœ€è¦çš„æŸæª”案。請您修ç†é€™å€‹å¥—件å†è©¦è©¦ã€‚" -#: apt-pkg/acquire-item.cc:817 +#: apt-pkg/acquire-item.cc:814 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%sã€ç´¢å¼•æª”æ壞—缺少『Filename:ã€æ¬„。" -#: apt-pkg/acquire-item.cc:904 +#: apt-pkg/acquire-item.cc:901 msgid "Size mismatch" msgstr "檔案大å°ä¸ç¬¦åˆã€‚" -- cgit v1.2.3 From aa97e2e3de4cbc4f5cb9f4191e8947111090492d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 23 Nov 2005 15:40:24 +0000 Subject: * fix for #340448 --- apt-pkg/contrib/md5.h | 1 + debian/changelog | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index 9447e9956..e280d714e 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -29,6 +29,7 @@ #include #include +#include using std::string; using std::min; diff --git a/debian/changelog b/debian/changelog index 92dda6232..b67fb4909 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,8 @@ apt (0.6.43) unstable; urgency=low (closes: #339533) * pkgAcqFile is more flexible now (closes: #57091) * support a download rate limit for http (closes: #146877) - * imported lots of the speedup changes from #319377 + * included lots of the speedup changes from #319377 + * add stdint.h to contrib/md5.h (closes: #340448) -- -- cgit v1.2.3 From bac148a766ad6d280172b9faa99c9207fa49ba4b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Nov 2005 10:46:26 +0000 Subject: * finalized this release --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b67fb4909..968a1a053 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ apt (0.6.43) unstable; urgency=low * included lots of the speedup changes from #319377 * add stdint.h to contrib/md5.h (closes: #340448) - -- + -- Michael Vogt Fri, 25 Nov 2005 11:22:31 +0100 apt (0.6.42.3) unstable; urgency=low -- cgit v1.2.3 From 34255a9fad36a7dfc2365318f656d1ff6889df4f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 28 Nov 2005 10:17:17 +0000 Subject: * changelog updates --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 968a1a053..f7788534e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.43) unstable; urgency=low +apt (0.6.43) unstable; urgency=medium * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: * zh_CN.po: Completed to 510 strings(Closes: #338267) @@ -12,6 +12,7 @@ apt (0.6.43) unstable; urgency=low * support a download rate limit for http (closes: #146877) * included lots of the speedup changes from #319377 * add stdint.h to contrib/md5.h (closes: #340448) + * ABI change, library name changed (closes: #339147) -- Michael Vogt Fri, 25 Nov 2005 11:22:31 +0100 -- cgit v1.2.3 From b57c8bb4085634c3fbe219ae1fd005d6bd62987a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 28 Nov 2005 22:27:06 +0000 Subject: * build-depend on libdb4.3 now, fix for kFreeBSD (#317718) --- debian/changelog | 2 ++ debian/control | 2 +- methods/http.cc | 10 ++++++++-- po/apt-all.pot | 18 +++++++++--------- po/bs.po | 18 +++++++++--------- po/ca.po | 18 +++++++++--------- po/cs.po | 18 +++++++++--------- po/da.po | 18 +++++++++--------- po/de.po | 18 +++++++++--------- po/el.po | 18 +++++++++--------- po/en_GB.po | 18 +++++++++--------- po/es.po | 18 +++++++++--------- po/eu.po | 18 +++++++++--------- po/fi.po | 18 +++++++++--------- po/fr.po | 18 +++++++++--------- po/he.po | 18 +++++++++--------- po/hu.po | 18 +++++++++--------- po/it.po | 18 +++++++++--------- po/ja.po | 18 +++++++++--------- po/ko.po | 18 +++++++++--------- po/nb.po | 18 +++++++++--------- po/nl.po | 18 +++++++++--------- po/nn.po | 18 +++++++++--------- po/pl.po | 18 +++++++++--------- po/pt.po | 18 +++++++++--------- po/pt_BR.po | 18 +++++++++--------- po/ro.po | 18 +++++++++--------- po/ru.po | 18 +++++++++--------- po/sk.po | 18 +++++++++--------- po/sl.po | 18 +++++++++--------- po/sv.po | 18 +++++++++--------- po/tl.po | 18 +++++++++--------- po/zh_CN.po | 18 +++++++++--------- po/zh_TW.po | 18 +++++++++--------- 34 files changed, 290 insertions(+), 282 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7788534e..7745add68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ apt (0.6.43) unstable; urgency=medium * included lots of the speedup changes from #319377 * add stdint.h to contrib/md5.h (closes: #340448) * ABI change, library name changed (closes: #339147) + * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718) + * switch to libdb4.3 in build-depends -- Michael Vogt Fri, 25 Nov 2005 11:22:31 +0100 diff --git a/debian/control b/debian/control index 4aa7b5aa2..5c76a90eb 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 -Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) +Build-Depends: debhelper (>= 4.1.62), libdb4.3-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt diff --git a/methods/http.cc b/methods/http.cc index a5c9601e7..dc3f0b763 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -824,7 +824,10 @@ bool HttpMethod::Flush(ServerState *Srv) { if (File != 0) { - SetNonBlock(File->Fd(),false); + // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking + // can't be set + if (File->Name() != "/dev/null") + SetNonBlock(File->Fd(),false); if (Srv->In.WriteSpace() == false) return true; @@ -852,7 +855,10 @@ bool HttpMethod::ServerDie(ServerState *Srv) // Dump the buffer to the file if (Srv->State == ServerState::Data) { - SetNonBlock(File->Fd(),false); + // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking + // can't be set + if (File->Name() != "/dev/null") + SetNonBlock(File->Fd(),false); while (Srv->In.WriteSpace() == true) { if (Srv->In.Write(File->Fd()) == false) diff --git a/po/apt-all.pot b/po/apt-all.pot index f474c6a41..b57c99349 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1609,7 +1609,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1784,31 +1784,31 @@ msgstr "" msgid "Error writing to output file" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "" diff --git a/po/bs.po b/po/bs.po index b928190a8..d0f5d5cc8 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: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -1627,7 +1627,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1803,31 +1803,31 @@ msgstr "" msgid "Error writing to output file" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Povezivanje neuspjeÅ¡no" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "UnutraÅ¡nja greÅ¡ka" diff --git a/po/ca.po b/po/ca.po index bd1f47988..985864a3e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-07-19 01:31+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -1817,7 +1817,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:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1998,31 +1998,31 @@ msgstr "Connexió finalitzada" msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Error intern" diff --git a/po/cs.po b/po/cs.po index d7ccea80c..d8cbc05e9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-11 16:14+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -1793,7 +1793,7 @@ msgstr "Spojení datového socketu vyprÅ¡elo" msgid "Unable to accept connection" msgstr "Nemohu pÅ™ijmout spojení" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1970,31 +1970,31 @@ msgstr "ÄŒas spojení vyprÅ¡el" msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba Ätení ze serveru. Druhá strana zavÅ™ela spojení" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Chyba Ätení ze serveru" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Å patné datové záhlaví" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "VnitÅ™ní chyba" diff --git a/po/da.po b/po/da.po index 54fbdc88b..8fbc6da85 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-07 15:28+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" @@ -1799,7 +1799,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1978,31 +1978,31 @@ msgstr "Tidsudl msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Fejl ved læsning fra server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Intern fejl" diff --git a/po/de.po b/po/de.po index a28e3d9ca..2f66c7232 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@ -1837,7 +1837,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -2015,33 +2015,33 @@ msgstr "Verbindung erlitt Zeitüberschreitung" msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Interner Fehler" diff --git a/po/el.po b/po/el.po index 91b6a09f5..8f0ef4262 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: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-07-14 14:25EEST\n" "Last-Translator: Greek Translation Team \n" @@ -1832,7 +1832,7 @@ msgstr "Λήξη χÏόνου σÏνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "ΑδÏνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ΠÏόβλημα κατά το hashing του αÏχείου" @@ -2009,32 +2009,32 @@ msgstr "Λήξη χÏόνου σÏνδεσης" msgid "Error writing to output file" msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο εξόδου" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγÏαφή στο αÏχείο" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκÏο έκλεισε τη σÏνδεση" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Η σÏνδεση απέτυχε" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "ΕσωτεÏικό Σφάλμα" diff --git a/po/en_GB.po b/po/en_GB.po index a8fee4742..0eb77e1ac 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@ -1663,7 +1663,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1839,31 +1839,31 @@ msgstr "" msgid "Error writing to output file" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "" diff --git a/po/es.po b/po/es.po index fcc69804c..0e68bde46 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-08 20:36+0100\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: Spanish \n" @@ -1822,7 +1822,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexión" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1999,31 +1999,31 @@ msgstr "Expir msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerró la conexión." -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Fallo la conexión" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Error interno" diff --git a/po/eu.po b/po/eu.po index 42fcecc3b..1ffcde824 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: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-07 22:37+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale.org \n" @@ -1802,7 +1802,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1980,31 +1980,31 @@ msgstr "Konexioaren denbora-muga gainditu da" msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Barne-errorea" diff --git a/po/fi.po b/po/fi.po index 2388bf637..a26cbe97e 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: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -1804,7 +1804,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1981,31 +1981,31 @@ msgstr "Yhteys aikakatkaistiin" msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Sisäinen virhe" diff --git a/po/fr.po b/po/fr.po index f37e66292..0df9cfcd3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-01 18:16+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -1836,7 +1836,7 @@ msgstr "D msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" @@ -2018,31 +2018,31 @@ msgstr "D msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:873 +#: methods/http.cc:879 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:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Erreur interne" diff --git a/po/he.po b/po/he.po index 07848e46a..da106c60a 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -1616,7 +1616,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1792,31 +1792,31 @@ msgstr "" msgid "Error writing to output file" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "" diff --git a/po/hu.po b/po/hu.po index 731863ed4..093de2885 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-15 18:03+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -1811,7 +1811,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az idÅ‘keretet" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1988,31 +1988,31 @@ msgstr "IdÅ‘túllépés a kapcsolatban" msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:873 +#: methods/http.cc:879 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:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Kapcsolódás sikertelen" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "BelsÅ‘ hiba" diff --git a/po/it.po b/po/it.po index 7aeeec87b..49a3a580a 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-10-05 17:38+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -1818,7 +1818,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1999,32 +1999,32 @@ msgstr "Tempo limite per la connessione esaurito" msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Errore interno" diff --git a/po/ja.po b/po/ja.po index 2feec2ce8..69a69cb40 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-09 12:54+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -1814,7 +1814,7 @@ msgstr " msgid "Unable to accept connection" msgstr "Àܳ¤ò accept ¤Ç¤­¤Þ¤»¤ó" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥å¤Ç¤ÎÌäÂê" @@ -1991,31 +1991,31 @@ msgstr " msgid "Error writing to output file" msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "¥ê¥â¡¼¥È¦¤ÇÀܳ¤¬¥¯¥í¡¼¥º¤µ¤ì¤Æ¥µ¡¼¥Ð¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "¥µ¡¼¥Ð¤«¤é¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "ÉÔÀµ¤Ê¥Ø¥Ã¥À¤Ç¤¹" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Àܳ¼ºÇÔ" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "ÆâÉô¥¨¥é¡¼" diff --git a/po/ko.po b/po/ko.po index 23827460b..1691812bf 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-10 21:56+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -1802,7 +1802,7 @@ msgstr "ë°ì´í„° 소켓 ì—°ê²° 시간 초과" msgid "Unable to accept connection" msgstr "ì—°ê²°ì„ ë°›ì„ ìˆ˜ 없습니다" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "íŒŒì¼ í•´ì‹±ì— ë¬¸ì œê°€ 있습니다" @@ -1979,31 +1979,31 @@ msgstr "ì—°ê²° ì‹œê°„ì´ ì´ˆê³¼í–ˆìŠµë‹ˆë‹¤" msgid "Error writing to output file" msgstr "출력 파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "해당 파ì¼ì— 쓰는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "서버ì—ì„œ ì½ê³  ì—°ê²°ì„ ë‹«ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "서버ì—ì„œ ì½ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "í—¤ë” ë°ì´í„°ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "ì—°ê²°ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "내부 오류" diff --git a/po/nb.po b/po/nb.po index 34cfc1d6e..11eb54798 100644 --- a/po/nb.po +++ b/po/nb.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmål \n" @@ -1823,7 +1823,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke å godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@ -2000,31 +2000,31 @@ msgstr "Tidsavbrudd p msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Ødelagte hodedata" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Intern feil" diff --git a/po/nl.po b/po/nl.po index 3dc814ea2..501c3e42c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@ -1831,7 +1831,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -2010,32 +2010,32 @@ msgstr "Verbinding verliep" msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:873 +#: methods/http.cc:879 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:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Interne fout" diff --git a/po/nn.po b/po/nn.po index f57bba2af..7bc37dc01 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: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Håvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -1806,7 +1806,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nøkkel for fil" @@ -1983,31 +1983,31 @@ msgstr "Tidsavbrot p msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Feil ved lesing frå tenaren" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Øydelagde hovuddata" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Intern feil" diff --git a/po/pl.po b/po/pl.po index 54e94c641..47bce476b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-11 11:47+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@ -1816,7 +1816,7 @@ msgstr "Przekroczony czas po msgid "Unable to accept connection" msgstr "Nie uda³o siê przyj±æ po³±czenia" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie uda³o siê obliczyæ skrótu pliku" @@ -1993,31 +1993,31 @@ msgstr "Przekroczenie czasu po msgid "Error writing to output file" msgstr "B³±d przy pisaniu do pliku wyj¶ciowego" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "B³±d przy pisaniu do pliku" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "B³±d przy pisaniu do pliku" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "B³±d czytania z serwera: Zdalna strona zamknê³a po³±czenie" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "B³±d czytania z serwera" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "B³êdne dane nag³ówka" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Po³±czenie nie uda³o siê" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "B³±d wewnêtrzny" diff --git a/po/pt.po b/po/pt.po index af44e7f15..0557a71fd 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -1813,7 +1813,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@ -1990,31 +1990,31 @@ msgstr "A ligação expirou" msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligação" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Erro interno" diff --git a/po/pt_BR.po b/po/pt_BR.po index 54946a2c4..f50f8a176 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: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-06-16 10:24-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" @@ -1813,7 +1813,7 @@ msgstr "Conex msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1990,31 +1990,31 @@ msgstr "Conex msgid "Error writing to output file" msgstr "Erro gravando para arquivo de saída" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor Ponto remoto fechou a conexão" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Conexão falhou." -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Erro interno" diff --git a/po/ro.po b/po/ro.po index 9497f70b2..cd2884b6a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-08-25 17:43+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@ -1821,7 +1821,7 @@ msgstr "Timp de conectare data socket expirat" msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la indexarea fiÅŸierului" @@ -1998,32 +1998,32 @@ msgstr "Timp de conectare expirat" msgid "Error writing to output file" msgstr "Eroare la scrierea fiÅŸierului de rezultat" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Eroare la scrierea în fiÅŸier" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Eroare la scrierea în fiÅŸierul" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Conectare eÅŸuată" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Eroare internă" diff --git a/po/ru.po b/po/ru.po index a9921de46..82c158edf 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-10-22 12:24+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -1833,7 +1833,7 @@ msgstr "Ð’Ñ€ÐµÐ¼Ñ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñоке msgid "Unable to accept connection" msgstr "Ðевозможно принÑÑ‚ÑŒ Ñоединение" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при Ñ…Ñшировании файла" @@ -2014,31 +2014,31 @@ msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¸Ñтекло" msgid "Error writing to output file" msgstr "Ошибка запиÑи в выходной файл" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Ошибка запиÑи в файл" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Ошибка запиÑи в файл" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтениÑ, удалённый Ñервер прервал Ñоединение" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ Ñервера" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Ðеверный заголовок данных" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°" diff --git a/po/sk.po b/po/sk.po index 451d2379e..4c5c03fbf 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-07-01 09:34+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@ -1797,7 +1797,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijaÅ¥" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@ -1974,31 +1974,31 @@ msgstr "Uplynul Äas spojenia" msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri Äítaní zo servera. Druhá strana ukonÄila spojenie" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Chyba pri Äítaní zo servera" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Vnútorná chyba" diff --git a/po/sl.po b/po/sl.po index 92fbaaa4a..92bfd0f71 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: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Èuhalev \n" "Language-Team: Slovenian \n" @@ -1796,7 +1796,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoèe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Te¾ava pri razpr¹evanju datoteke" @@ -1973,31 +1973,31 @@ msgstr " msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s stre¾nika " -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Napaka pri branju s stre¾nika" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Napaèni podatki glave" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Notranja napaka" diff --git a/po/sv.po b/po/sv.po index b0d1e03ac..56770b066 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-02 23:56+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -1809,7 +1809,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -1992,31 +1992,31 @@ msgstr "Tidsgr msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:873 +#: methods/http.cc:879 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:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Internt fel" diff --git a/po/tl.po b/po/tl.po index 18f664faf..55d8106d1 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-03 03:35+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -1814,7 +1814,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1995,31 +1995,31 @@ msgstr "Nag-timeout ang koneksyon" msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "Maling datos sa header" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "Internal na error" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6501190a1..24569e23e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-11-15 00:05+0800\n" "Last-Translator: Tchaikov \n" "Language-Team: Debian Chinese [GB] \n" @@ -1778,7 +1778,7 @@ msgstr "æ•°æ®å¥—接字连接超时" msgid "Unable to accept connection" msgstr "无法接å—连接" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1953,31 +1953,31 @@ msgstr "连接æœåŠ¡å™¨è¶…æ—¶" msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "从æœåŠ¡å™¨è¯»å–æ•°æ®æ—¶å‡ºé”™ï¼Œå¯¹æ–¹å…³é—­äº†è¿žæŽ¥" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "从æœåŠ¡å™¨è¯»å–æ•°æ®å‡ºé”™" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "错误的报头数æ®" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "内部错误" diff --git a/po/zh_TW.po b/po/zh_TW.po index f405147f8..739c14d3e 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: \n" -"POT-Creation-Date: 2005-11-23 00:39+0100\n" +"POT-Creation-Date: 2005-11-28 23:02+0100\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@ -1789,7 +1789,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法å…許連線" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "å•é¡Œé›œæ¹Šè¡¨" @@ -1966,31 +1966,31 @@ msgstr "連線逾時" msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:834 +#: methods/http.cc:837 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:859 +#: methods/http.cc:865 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:873 +#: methods/http.cc:879 msgid "Error reading from server. Remote end closed connection" msgstr "從é ç«¯ä¸»æ©Ÿè®€å–錯誤，關閉連線" -#: methods/http.cc:875 +#: methods/http.cc:881 msgid "Error reading from server" msgstr "從伺æœå™¨è®€å–發生錯誤" -#: methods/http.cc:1106 +#: methods/http.cc:1112 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1123 +#: methods/http.cc:1129 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1214 +#: methods/http.cc:1220 msgid "Internal error" msgstr "內部錯誤" -- cgit v1.2.3 From 5a61e0600b5ba3dc6eb3629185ecc133d6877ae0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 28 Nov 2005 23:17:27 +0000 Subject: * fix mailaddress --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7745add68..05e4d5f74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,7 @@ apt (0.6.43) unstable; urgency=medium * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718) * switch to libdb4.3 in build-depends - -- Michael Vogt Fri, 25 Nov 2005 11:22:31 +0100 + -- Michael Vogt Tue, 29 Nov 2005 00:17:07 +0100 apt (0.6.42.3) unstable; urgency=low -- cgit v1.2.3 From 39442e44c7f68722014dbcd6af061c2856ce76db Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 29 Nov 2005 13:39:41 +0000 Subject: * fix a string (thanks to bubulle) --- 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 db895a6c1..e3b4d94f8 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -241,7 +241,7 @@ bool pkgSourceList::ReadAppend(string File) Type *Parse = Type::GetType(LineType.c_str()); if (Parse == 0) - return _error->Error(_("Type '%s' is not known in on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str()); + return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str()); // Vendor name specified if (C[0] == '[') -- cgit v1.2.3