Browse Source

* apt-pkg/contrib/fileutl.cc:

- Fix the newly introduced method GetListOfFilesInDir to not
    accept every file if no extension is enforced
    (= restore old behaviour). (Closes: #565213)
* apt-pkg/policy.cc:
  - accept also partfiles with "pref" file extension as valid
* apt-pkg/contrib/configuration.cc:
  - accept also partfiles with "conf" file extension as valid
* doc/apt.conf.5.xml:
  - reorder description and split out syntax
  - add partfile name convention (Closes: #558348)
* doc/apt_preferences.conf.5.xml:
  - describe partfile name convention also here
* apt-pkg/deb/dpkgpm.cc:
  - don't segfault if term.log file can't be opened.
    Thanks Sam Brightman for the patch! (Closes: #475770)
* doc/*:
  - replace the per language addendum with a global addendum
  - add a explanation why translations include (maybe) english
    parts to the new global addendum (Closes: #561636)
* apt-pkg/contrib/strutl.cc:
  - fix malloc asseration fail with ja_JP.eucJP locale in
    apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884)
debian/1.8.y
Michael Vogt 13 years ago
parent
commit
b39c18596d
  1. 2
      apt-pkg/contrib/configuration.cc
  2. 10
      apt-pkg/contrib/error.h
  3. 84
      apt-pkg/contrib/fileutl.cc
  4. 5
      apt-pkg/contrib/fileutl.h
  5. 49
      apt-pkg/contrib/strutl.cc
  6. 22
      apt-pkg/contrib/system.h
  7. 7
      apt-pkg/deb/dpkgpm.cc
  8. 2
      apt-pkg/policy.cc
  9. 28
      debian/changelog
  10. 33
      doc/apt.conf.5.xml
  11. 19
      doc/apt.ent
  12. 7
      doc/apt_preferences.5.xml
  13. 6
      doc/de/addendum/debiandoc_de.add
  14. 6
      doc/de/addendum/xml_de.add
  15. 9
      doc/es/addendum/xml_es.add
  16. 7
      doc/fr/addendum/xml_fr.add
  17. 7
      doc/ja/addendum/xml_ja.add
  18. 947
      doc/po/apt-doc.pot
  19. 1820
      doc/po/de.po
  20. 1041
      doc/po/es.po
  21. 1880
      doc/po/fr.po
  22. 943
      doc/po/it.po
  23. 1056
      doc/po/ja.po
  24. 943
      doc/po/pl.po
  25. 956
      doc/po/pt_BR.po
  26. 39
      doc/po4a.conf
  27. 5
      doc/pt_BR/addendum/xml_pt_BR.add
  28. 5
      doc/xml.add
  29. 349
      po/apt-all.pot
  30. 82
      test/libapt/getlistoffilesindir_test.cc
  31. 50
      test/libapt/run-tests.sh

2
apt-pkg/contrib/configuration.cc

@ -832,7 +832,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
bool ReadConfigDir(Configuration &Conf,const string &Dir,
bool AsSectional, unsigned Depth)
{
vector<string> const List = GetListOfFilesInDir(Dir, "", true);
vector<string> const List = GetListOfFilesInDir(Dir, "conf", true, true);
// Read the files
for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)

10
apt-pkg/contrib/error.h

@ -53,6 +53,8 @@
#include <string>
#include <system.h>
using std::string;
class GlobalError
@ -71,13 +73,13 @@ class GlobalError
public:
// Call to generate an error from a library call.
bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2;
bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2;
bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2 __cold;
bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2 __cold;
/* A warning should be considered less severe than an error, and may be
ignored by the client. */
bool Error(const char *Description,...) APT_MFORMAT1;
bool Warning(const char *Description,...) APT_MFORMAT1;
bool Error(const char *Description,...) APT_MFORMAT1 __cold;
bool Warning(const char *Description,...) APT_MFORMAT1 __cold;
// Simple accessors
inline bool PendingError() {return PendingFlag;};

84
apt-pkg/contrib/fileutl.cc

@ -202,8 +202,37 @@ bool FileExists(string File)
/* If an extension is given only files with this extension are included
in the returned vector, otherwise every "normal" file is included. */
std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
bool const &SortList)
bool const &SortList)
{
return GetListOfFilesInDir(Dir, Ext, SortList, false);
}
std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
bool const &SortList, bool const &AllowNoExt)
{
std::vector<string> ext;
ext.reserve(2);
if (Ext.empty() == false)
ext.push_back(Ext);
if (AllowNoExt == true && ext.empty() == false)
ext.push_back("");
return GetListOfFilesInDir(Dir, ext, SortList);
}
std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,
bool const &SortList)
{
// Attention debuggers: need to be set with the environment config file!
bool const Debug = _config->FindB("Debug::GetListOfFilesInDir", false);
if (Debug == true)
{
std::clog << "Accept in " << Dir << " only files with the following " << Ext.size() << " extensions:" << std::endl;
if (Ext.empty() == true)
std::clog << "\tNO extension" << std::endl;
else
for (std::vector<string>::const_iterator e = Ext.begin();
e != Ext.end(); ++e)
std::clog << '\t' << (e->empty() == true ? "NO" : *e) << " extension" << std::endl;
}
std::vector<string> List;
DIR *D = opendir(Dir.c_str());
if (D == 0)
@ -214,28 +243,73 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D))
{
// skip "hidden" files
if (Ent->d_name[0] == '.')
continue;
if (Ext.empty() == false && flExtension(Ent->d_name) != Ext)
continue;
// check for accepted extension:
// no extension given -> periods are bad as hell!
// extensions given -> "" extension allows no extension
if (Ext.empty() == false)
{
string d_ext = flExtension(Ent->d_name);
if (d_ext == Ent->d_name) // no extension
{
if (std::find(Ext.begin(), Ext.end(), "") == Ext.end())
{
if (Debug == true)
std::clog << "Bad file: " << Ent->d_name << " → no extension" << std::endl;
continue;
}
}
else if (std::find(Ext.begin(), Ext.end(), d_ext) == Ext.end())
{
if (Debug == true)
std::clog << "Bad file: " << Ent->d_name << " → bad extension »" << flExtension(Ent->d_name) << "«" << std::endl;
continue;
}
}
// Skip bad file names ala run-parts
// Skip bad filenames ala run-parts
const char *C = Ent->d_name;
for (; *C != 0; ++C)
if (isalpha(*C) == 0 && isdigit(*C) == 0
&& *C != '_' && *C != '-' && *C != '.')
&& *C != '_' && *C != '-') {
// no required extension -> dot is a bad character
if (*C == '.' && Ext.empty() == false)
continue;
break;
}
// we don't reach the end of the name -> bad character included
if (*C != 0)
{
if (Debug == true)
std::clog << "Bad file: " << Ent->d_name << " → bad character »"
<< *C << "« in filename (period allowed: " << (Ext.empty() ? "no" : "yes") << ")" << std::endl;
continue;
}
// skip filenames which end with a period. These are never valid
if (*(C - 1) == '.')
{
if (Debug == true)
std::clog << "Bad file: " << Ent->d_name << " → Period as last character" << std::endl;
continue;
}
// Make sure it is a file and not something else
string const File = flCombine(Dir,Ent->d_name);
struct stat St;
if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0)
{
if (Debug == true)
std::clog << "Bad file: " << Ent->d_name << " → stat says not a good file" << std::endl;
continue;
}
if (Debug == true)
std::clog << "Accept file: " << Ent->d_name << " in " << Dir << std::endl;
List.push_back(File);
}
closedir(D);

5
apt-pkg/contrib/fileutl.h

@ -82,8 +82,13 @@ bool RunScripts(const char *Cnf);
bool CopyFile(FileFd &From,FileFd &To);
int GetLock(string File,bool Errors = true);
bool FileExists(string File);
// FIXME: next ABI-Break: merge the two method-headers
std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
bool const &SortList);
std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
bool const &SortList, bool const &AllowNoExt);
std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,
bool const &SortList);
string SafeGetCWD();
void SetCloseExec(int Fd,bool Close);
void SetNonBlock(int Fd,bool Block);

49
apt-pkg/contrib/strutl.cc

@ -43,9 +43,10 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
{
iconv_t cd;
const char *inbuf;
char *inptr, *outbuf, *outptr;
size_t insize, outsize;
char *inptr, *outbuf;
size_t insize, bufsize;
dest->clear();
cd = iconv_open(codeset, "UTF-8");
if (cd == (iconv_t)(-1)) {
// Something went wrong
@ -55,33 +56,49 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
else
perror("iconv_open");
// Clean the destination string
*dest = "";
return false;
}
insize = outsize = orig.size();
insize = bufsize = orig.size();
inbuf = orig.data();
inptr = (char *)inbuf;
outbuf = new char[insize+1];
outptr = outbuf;
outbuf = new char[bufsize];
size_t lastError = -1;
while (insize != 0)
{
char *outptr = outbuf;
size_t outsize = bufsize;
size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize);
dest->append(outbuf, outptr - outbuf);
if (err == (size_t)(-1))
{
insize--;
outsize++;
inptr++;
*outptr = '?';
outptr++;
switch (errno)
{
case EILSEQ:
insize--;
inptr++;
// replace a series of unknown multibytes with a single "?"
if (lastError != insize) {
lastError = insize - 1;
dest->append("?");
}
break;
case EINVAL:
insize = 0;
break;
case E2BIG:
if (outptr == outbuf)
{
bufsize *= 2;
delete[] outbuf;
outbuf = new char[bufsize];
}
break;
}
}
}
*outptr = '\0';
*dest = outbuf;
delete[] outbuf;
iconv_close(cd);

22
apt-pkg/contrib/system.h

@ -55,4 +55,26 @@
#define CLRFLAG(v,f) ((v) &=~FLAG(f))
#define CHKFLAG(v,f) ((v) & FLAG(f) ? true : false)
// some nice optional GNUC features
#if __GNUC__ >= 3
#define __must_check __attribute__ ((warn_unused_result))
#define __deprecated __attribute__ ((deprecated))
/* likely() and unlikely() can be used to mark boolean expressions
as (not) likely true which will help the compiler to optimise */
#define likely(x) __builtin_expect (!!(x), 1)
#define unlikely(x) __builtin_expect (!!(x), 0)
#else
#define __must_check /* no warn_unused_result */
#define __deprecated /* no deprecated */
#define likely(x) (x)
#define unlikely(x) (x)
#endif
// cold functions are unlikely() to be called
#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4
#define __cold __attribute__ ((__cold__))
#else
#define __cold /* no cold marker */
#endif
#endif

7
apt-pkg/deb/dpkgpm.cc

@ -561,15 +561,16 @@ bool pkgDPkgPM::OpenLog()
if (!logfile_name.empty())
{
term_out = fopen(logfile_name.c_str(),"a");
if (term_out == NULL)
return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str());
chmod(logfile_name.c_str(), 0600);
// output current time
char outstr[200];
time_t t = time(NULL);
struct tm *tmp = localtime(&t);
strftime(outstr, sizeof(outstr), "%F %T", tmp);
fprintf(term_out, "\nLog started: ");
fprintf(term_out, "%s", outstr);
fprintf(term_out, "\n");
fprintf(term_out, "\nLog started: %s\n", outstr);
}
return true;
}

2
apt-pkg/policy.cc

@ -280,7 +280,7 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir)
return true;
}
vector<string> const List = GetListOfFilesInDir(Dir, "", true);
vector<string> const List = GetListOfFilesInDir(Dir, "pref", true, true);
// Read the files
for (vector<string>::const_iterator I = List.begin(); I != List.end(); I++)

28
debian/changelog

@ -8,6 +8,34 @@ apt (0.7.25.2) UNRELEASED; urgency=low
-- Michael Vogt <michael.vogt@ubuntu.com> Fri, 22 Jan 2010 20:06:12 +0100
apt (0.7.25.2) UNRELEASED; urgency=low
* apt-pkg/contrib/fileutl.cc:
- Fix the newly introduced method GetListOfFilesInDir to not
accept every file if no extension is enforced
(= restore old behaviour). (Closes: #565213)
* apt-pkg/policy.cc:
- accept also partfiles with "pref" file extension as valid
* apt-pkg/contrib/configuration.cc:
- accept also partfiles with "conf" file extension as valid
* doc/apt.conf.5.xml:
- reorder description and split out syntax
- add partfile name convention (Closes: #558348)
* doc/apt_preferences.conf.5.xml:
- describe partfile name convention also here
* apt-pkg/deb/dpkgpm.cc:
- don't segfault if term.log file can't be opened.
Thanks Sam Brightman for the patch! (Closes: #475770)
* doc/*:
- replace the per language addendum with a global addendum
- add a explanation why translations include (maybe) english
parts to the new global addendum (Closes: #561636)
* apt-pkg/contrib/strutl.cc:
- fix malloc asseration fail with ja_JP.eucJP locale in
apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884)
-- David Kalnischkies <kalnischkies@gmail.com> Sat, 16 Jan 2010 21:06:38 +0100
apt (0.7.25.1) unstable; urgency=low
[ Christian Perrier ]

33
doc/apt.conf.5.xml

@ -21,7 +21,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
<date>18 September 2009</date>
<date>16 January 2010</date>
</refentryinfo>
<refmeta>
@ -37,16 +37,27 @@
</refnamediv>
<refsect1><title>Description</title>
<para><filename>apt.conf</filename> is the main configuration file for the APT suite of
tools, all tools make use of the configuration file and a common command line
parser to provide a uniform environment. When an APT tool starts up it will
read the configuration specified by the <envar>APT_CONFIG</envar> environment
variable (if any) and then read the files in <literal>Dir::Etc::Parts</literal>
then read the main configuration file specified by
<literal>Dir::Etc::main</literal> then finally apply the
command line options to override the configuration directives, possibly
loading even more config files.</para>
<para><filename>apt.conf</filename> is the main configuration file for
the APT suite of tools, but by far not the only place changes to options
can be made. All tools therefore share the configuration files and also
use a common command line parser to provide a uniform environment.</para>
<orderedlist>
<para>When an APT tool starts up it will read the configuration files
in the following order:</para>
<listitem><para>the file specified by the <envar>APT_CONFIG</envar>
environment variable (if any)</para></listitem>
<listitem><para>all files in <literal>Dir::Etc::Parts</literal> in
alphanumeric ascending order which have no or "<literal>conf</literal>"
as filename extension and which only contain alphanumeric,
hyphen (-), underscore (_) and period (.) characters -
otherwise they will be silently ignored.</para></listitem>
<listitem><para>the main configuration file specified by
<literal>Dir::Etc::main</literal></para></listitem>
<listitem><para>the command line options are applied to override the
configuration directives or to load even more configuration files.</para></listitem>
</orderedlist>
</refsect1>
<refsect1><title>Syntax</title>
<para>The configuration file is organized in a tree with options organized into
functional groups. Option specification is given with a double colon
notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within

19
doc/apt.ent

@ -366,3 +366,22 @@
Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>
</varlistentry>
">
<!ENTITY translation-title "TRANSLATION">
<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed
to the translation in the past, who is responsible now and maybe further information
specially related to your translation. -->
<!ENTITY translation-holder "
The english translation was done by John Doe <email>john@doe.org</email> in 2009,
2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the
Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.
">
<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings
in a shipped manpage will maybe appear english parts. -->
<!ENTITY translation-english "
Note that this translated document may contain untranslated parts.
This is done on purpose, to avoid losing content when the
translation is lagging behind the original content.
">

7
doc/apt_preferences.5.xml

@ -53,6 +53,13 @@ earliest in the &sources-list; file.
The APT preferences file does not affect the choice of instance, only
the choice of version.</para>
<para>Note that the files in the <filename>/etc/apt/preferences.d</filename>
directory are parsed in alphanumeric ascending order and need to obey the
following naming convention: The files have no or "<literal>pref</literal>"
as filename extension and which only contain alphanumeric, hyphen (-),
underscore (_) and period (.) characters - otherwise they will be silently
ignored.</para>
<refsect2><title>APT's Default Priority Assignments</title>
<para>If there is no preferences file or if there is no entry in the file

6
doc/de/addendum/debiandoc_de.add

@ -1,6 +0,0 @@
PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
<refsect1><title>Übersetzung</title>
<para>Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
</refsect1>

6
doc/de/addendum/xml_de.add

@ -1,6 +0,0 @@
PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
<refsect1><title>Übersetzung</title>
<para>Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
</refsect1>

9
doc/es/addendum/xml_es.add

@ -1,9 +0,0 @@
PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
<refsect1><title>Translation</title>
<para>The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),
Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),
Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),
Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)
and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)
under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.
</refsect1>

7
doc/fr/addendum/xml_fr.add

@ -1,7 +0,0 @@
PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
<refsect1><title>Traducteurs</title>
<para>Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009),
Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>
</para>
</refsect1>

7
doc/ja/addendum/xml_ja.add

@ -1,7 +0,0 @@
PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
<refsect1><title>訳者</title>
<para>倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),
Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>
</para>
</refsect1>

947
doc/po/apt-doc.pot

File diff suppressed because it is too large

1820
doc/po/de.po

File diff suppressed because it is too large

1041
doc/po/es.po

File diff suppressed because it is too large

1880
doc/po/fr.po

File diff suppressed because it is too large

943
doc/po/it.po

File diff suppressed because it is too large

1056
doc/po/ja.po

File diff suppressed because it is too large

943
doc/po/pl.po

File diff suppressed because it is too large

956
doc/po/pt_BR.po

File diff suppressed because it is too large

39
doc/po4a.conf

@ -7,32 +7,19 @@
# define source file and translated file (one file per line)
[type: man] apt.8 $lang:$lang/apt.$lang.8
[type: entity] apt.ent $lang:$lang/apt.ent
[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \
add_$lang:$lang/addendum/xml_$lang.add
[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add
[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml add_$lang:xml.add
[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml add_$lang:xml.add
[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add
[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add
[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add
[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add
[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml add_$lang:xml.add
[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml add_$lang:xml.add
[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add
[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml add_$lang:xml.add
[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml add_$lang:xml.add
[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml add_$lang:xml.add
[type: sgml] guide.sgml $lang:$lang/guide.$lang.sgml
# add_$lang::$lang/addendum/debiandoc_$lang.add

5
doc/pt_BR/addendum/xml_pt_BR.add

@ -1,5 +0,0 @@
PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
<refsect1><title>Tradução</title>
Esta página de manual foi traduzida para o Português do Brasil por
André Luís Lopes <email>andrelop@ig.com.br</email>.
</refsect1>

5
doc/xml.add

@ -0,0 +1,5 @@
PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
<refsect1><title>&translation-title;</title>
<para>&translation-holder;</para>
<para>&translation-english;</para>
</refsect1>

349
po/apt-all.pot

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-01 19:13+0100\n"
"POT-Creation-Date: 2010-01-11 15:17+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -146,7 +146,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@ -241,7 +241,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
#, c-format
msgid "Unable to write to %s"
msgstr ""
@ -337,7 +337,7 @@ msgstr ""
#: ftparchive/cachedb.cc:72
msgid ""
"DB format is invalid. If you upgraded from a older version of apt, please "
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@ -352,11 +352,11 @@ msgstr ""
msgid "Failed to stat %s"
msgstr ""
#: ftparchive/cachedb.cc:238
#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr ""
#: ftparchive/cachedb.cc:444
#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr ""
@ -421,26 +421,26 @@ msgstr ""
msgid " DeLink limit of %sB hit.\n"
msgstr ""
#: ftparchive/writer.cc:388
#: ftparchive/writer.cc:389
msgid "Archive had no package field"
msgstr ""
#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
#, c-format
msgid " %s has no override entry\n"
msgstr ""
#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
#: ftparchive/writer.cc:637
#: ftparchive/writer.cc:638
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
#: ftparchive/writer.cc:641
#: ftparchive/writer.cc:642
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@ -544,7 +544,7 @@ msgstr ""
msgid "Y"
msgstr ""
#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@ -703,11 +703,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
msgid "Unable to lock the download directory"
msgstr ""
#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@ -736,8 +736,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
#: cmdline/apt-get.cc:2252
#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
#: cmdline/apt-get.cc:2262
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@ -771,7 +771,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@ -780,7 +780,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
msgid "Download complete and in download only mode"
msgstr ""
@ -872,50 +872,50 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
#. if (VerTag.empty() == false && Last == 0)
#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#: cmdline/apt-get.cc:1321
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
#: cmdline/apt-get.cc:1313
#: cmdline/apt-get.cc:1352
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
#: cmdline/apt-get.cc:1342
#. if (VerTag.empty() == false && Last == 0)
#: cmdline/apt-get.cc:1389
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
#: cmdline/apt-get.cc:1395
#: cmdline/apt-get.cc:1405
msgid "The update command takes no arguments"
msgstr ""
#: cmdline/apt-get.cc:1408
#: cmdline/apt-get.cc:1418
msgid "Unable to lock the list directory"
msgstr ""
#: cmdline/apt-get.cc:1464
#: cmdline/apt-get.cc:1474
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
#: cmdline/apt-get.cc:1513
#: cmdline/apt-get.cc:1523
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
#: cmdline/apt-get.cc:1515
#: cmdline/apt-get.cc:1525
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
#: cmdline/apt-get.cc:1516
#: cmdline/apt-get.cc:1526
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
#: cmdline/apt-get.cc:1521
#: cmdline/apt-get.cc:1531
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@ -931,49 +931,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
msgid "The following information may help to resolve the situation:"
msgstr ""
#: cmdline/apt-get.cc:1528
#: cmdline/apt-get.cc:1538
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
#: cmdline/apt-get.cc:1547
#: cmdline/apt-get.cc:1557
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
#: cmdline/apt-get.cc:1602
#: cmdline/apt-get.cc:1612
#, c-format
msgid "Couldn't find task %s"
msgstr ""
#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
#, c-format
msgid "Couldn't find package %s"
msgstr ""
#: cmdline/apt-get.cc:1740
#: cmdline/apt-get.cc:1750
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
#: cmdline/apt-get.cc:1771
#: cmdline/apt-get.cc:1781
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
#: cmdline/apt-get.cc:1784
#: cmdline/apt-get.cc:1794
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
#: cmdline/apt-get.cc:1787
#: cmdline/apt-get.cc:1797
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
#: cmdline/apt-get.cc:1799
#: cmdline/apt-get.cc:1809
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"
@ -981,152 +981,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
#: cmdline/apt-get.cc:1817
#: cmdline/apt-get.cc:1827
msgid "Broken packages"
msgstr ""
#: cmdline/apt-get.cc:1846
#: cmdline/apt-get.cc:1856
msgid "The following extra packages will be installed:"
msgstr ""
#: cmdline/apt-get.cc:1935
#: cmdline/apt-get.cc:1945
msgid "Suggested packages:"
msgstr ""
#: cmdline/apt-get.cc:1936
#: cmdline/apt-get.cc:1946
msgid "Recommended packages:"
msgstr ""
#: cmdline/apt-get.cc:1965
#: cmdline/apt-get.cc:1975
msgid "Calculating upgrade... "
msgstr ""
#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr ""
#: cmdline/apt-get.cc:1973
#: cmdline/apt-get.cc:1983
msgid "Done"
msgstr ""
#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
msgid "Internal error, problem resolver broke stuff"
msgstr ""
#: cmdline/apt-get.cc:2148
#: cmdline/apt-get.cc:2158
msgid "Must specify at least one package to fetch source for"
msgstr ""
#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
#: cmdline/apt-get.cc:2227
#: cmdline/apt-get.cc:2237
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
#: cmdline/apt-get.cc:2262
#: cmdline/apt-get.cc:2272
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
#: cmdline/apt-get.cc:2268
#: cmdline/apt-get.cc:2278
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#: cmdline/apt-get.cc:2271
#: cmdline/apt-get.cc:2281
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
#: cmdline/apt-get.cc:2277
#: cmdline/apt-get.cc:2287
#, c-format
msgid "Fetch source %s\n"
msgstr ""
#: cmdline/apt-get.cc:2308
#: cmdline/apt-get.cc:2318
msgid "Failed to fetch some archives."
msgstr ""
#: cmdline/apt-get.cc:2336
#: cmdline/apt-get.cc:2346
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
#: cmdline/apt-get.cc:2348
#: cmdline/apt-get.cc:2358
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
#: cmdline/apt-get.cc:2349
#: cmdline/apt-get.cc:2359
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
#: cmdline/apt-get.cc:2366
#: cmdline/apt-get.cc:2376
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
#: cmdline/apt-get.cc:2385
#: cmdline/apt-get.cc:2395
msgid "Child process failed"
msgstr ""
#: cmdline/apt-get.cc:2401
#: cmdline/apt-get.cc:2411
msgid "Must specify at least one package to check builddeps for"
msgstr ""
#: cmdline/apt-get.cc:2429
#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
#: cmdline/apt-get.cc:2449
#: cmdline/apt-get.cc:2459
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
#: cmdline/apt-get.cc:2501
#: cmdline/apt-get.cc:2511
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
#: cmdline/apt-get.cc:2554
#: cmdline/apt-get.cc:2564
#, 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:2590
#: cmdline/apt-get.cc:2600
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
#: cmdline/apt-get.cc:2617
#: cmdline/apt-get.cc:2627
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
#: cmdline/apt-get.cc:2633
#: cmdline/apt-get.cc:2643
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
#: cmdline/apt-get.cc:2638
#: cmdline/apt-get.cc:2648
msgid "Failed to process build dependencies"
msgstr ""
#: cmdline/apt-get.cc:2670
#: cmdline/apt-get.cc:2680
msgid "Supported modules:"
msgstr ""
#: cmdline/apt-get.cc:2711
#: cmdline/apt-get.cc:2721
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@ -1170,7 +1170,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
#: cmdline/apt-get.cc:2879
#: cmdline/apt-get.cc:2889
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@ -1400,11 +1400,10 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
#, c-format
msgid "Unable to read %s"
msgstr ""
@ -1434,9 +1433,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
#: apt-pkg/pkgcachegen.cc:961
#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
#: apt-pkg/pkgcachegen.cc:1008
msgid "Reading package lists"
msgstr ""
@ -1565,11 +1564,11 @@ msgid "File not found"
msgstr ""
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
#: methods/rred.cc:234 methods/rred.cc:243
#: methods/rred.cc:483 methods/rred.cc:492
msgid "Failed to stat"
msgstr ""
#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
msgid "Failed to set modification time"
msgstr ""
@ -1629,7 +1628,7 @@ msgstr ""
msgid "Server closed the connection"
msgstr ""
#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
msgid "Read error"
msgstr ""
@ -1641,7 +1640,7 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
msgid "Write error"
msgstr ""
@ -1695,7 +1694,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@ -1759,58 +1758,63 @@ msgstr ""
msgid "Connecting to %s"
msgstr ""
#: methods/connect.cc:165 methods/connect.cc:184
#: methods/connect.cc:166 methods/connect.cc:185
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
#: methods/connect.cc:190
#: methods/connect.cc:191
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
#: methods/connect.cc:193
#: methods/connect.cc:194
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
#: methods/connect.cc:240
#: methods/connect.cc:241
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr ""
#: methods/gpgv.cc:71
#. TRANSLATOR: %s is the trusted keyring parts directory
#: methods/gpgv.cc:78
#, c-format
msgid "Couldn't access keyring: '%s'"
msgid "No keyring installed in %s."
msgstr ""
#: methods/gpgv.cc:107
#: methods/gpgv.cc:104
msgid "E: Too many keyrings should be passed to gpgv. Exiting."
msgstr ""
#: methods/gpgv.cc:121
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
#: methods/gpgv.cc:223
#: methods/gpgv.cc:237
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
#: methods/gpgv.cc:228
#: methods/gpgv.cc:242
msgid "At least one invalid signature was encountered."
msgstr ""
#: methods/gpgv.cc:232
#: methods/gpgv.cc:246
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
#: methods/gpgv.cc:237
#: methods/gpgv.cc:251
msgid "Unknown error executing gpgv"
msgstr ""
#: methods/gpgv.cc:271 methods/gpgv.cc:278
#: methods/gpgv.cc:285 methods/gpgv.cc:292
msgid "The following signatures were invalid:\n"
msgstr ""
#: methods/gpgv.cc:285
#: methods/gpgv.cc:299
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@ -1859,47 +1863,47 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
#: methods/http.cc:790
#: methods/http.cc:791
msgid "Select failed"
msgstr ""
#: methods/http.cc:795
#: methods/http.cc:796
msgid "Connection timed out"
msgstr ""
#: methods/http.cc:818
#: methods/http.cc:819
msgid "Error writing to output file"
msgstr ""
#: methods/http.cc:849
#: methods/http.cc:850
msgid "Error writing to file"
msgstr ""
#: methods/http.cc:877
#: methods/http.cc:878
msgid "Error writing to the file"
msgstr ""
#: methods/http.cc:891
#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
#: methods/http.cc:893
#: methods/http.cc:894
msgid "Error reading from server"
msgstr ""
#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr ""
#: methods/http.cc:1149
#: methods/http.cc:1150
msgid "Bad header data"
msgstr ""
#: methods/http.cc:1166 methods/http.cc:1221
#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr ""
#: methods/http.cc:1313
#: methods/http.cc:1314
msgid "Internal error"
msgstr ""
@ -1907,18 +1911,25 @@ msgstr ""
msgid "Can't mmap an empty file"
msgstr ""
#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
#: apt-pkg/contrib/mmap.cc:234
#: apt-pkg/contrib/mmap.cc:252
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
#: apt-pkg/contrib/mmap.cc:347
#, c-format
msgid ""
"The size of a MMap has already reached the defined limit of %lu bytes,abort "
"the try to grow the MMap."
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@ -1948,52 +1959,52 @@ msgstr ""
msgid "Selection %s not found"
msgstr ""
#: apt-pkg/contrib/configuration.cc:458
#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
#: apt-pkg/contrib/configuration.cc:516
#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
msgstr ""
#: apt-pkg/contrib/configuration.cc:684
#: apt-pkg/contrib/configuration.cc:678
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
#: apt-pkg/contrib/configuration.cc:703
#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
#: apt-pkg/contrib/configuration.cc:720
#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
#: apt-pkg/contrib/configuration.cc:760
#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
#: apt-pkg/contrib/configuration.cc:767
#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
#: apt-pkg/contrib/configuration.cc:780
#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
#: apt-pkg/contrib/configuration.cc:831
#: apt-pkg/contrib/configuration.cc:825
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@ -2069,75 +2080,75 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:149
#: apt-pkg/contrib/fileutl.cc:151
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:154
#: apt-pkg/contrib/fileutl.cc:156
#, c-format
msgid "Could not open lock file %s"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:172
#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:176
#: apt-pkg/contrib/fileutl.cc:178
#, c-format
msgid "Could not get lock %s"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:444
#: apt-pkg/contrib/fileutl.cc:568
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:456
#: apt-pkg/contrib/fileutl.cc:580
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
#: apt-pkg/contrib/fileutl.cc:458
#: apt-pkg/contrib/fileutl.cc:582
#, c-format
msgid "Sub-process %s received signal %u."
msgstr ""
#: apt-pkg/contrib/fileutl.cc:462
#: apt-pkg/contrib/fileutl.cc:586
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:464
#: apt-pkg/contrib/fileutl.cc:588
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:508
#: apt-pkg/contrib/fileutl.cc:632
#, c-format
msgid "Could not open file %s"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:564
#: apt-pkg/contrib/fileutl.cc:688
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:594
#: apt-pkg/contrib/fileutl.cc:718
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:669
#: apt-pkg/contrib/fileutl.cc:793
msgid "Problem closing the file"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:675
#: apt-pkg/contrib/fileutl.cc:799
msgid "Problem unlinking the file"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:686
#: apt-pkg/contrib/fileutl.cc:810
msgid "Problem syncing the file"
msgstr ""
@ -2254,52 +2265,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
#: apt-pkg/sourcelist.cc:90
#: apt-pkg/sourcelist.cc:83
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
#: apt-pkg/sourcelist.cc:92
#: apt-pkg/sourcelist.cc:85
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
#: apt-pkg/sourcelist.cc:95
#: apt-pkg/sourcelist.cc:88
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
#: apt-pkg/sourcelist.cc:101
#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
#: apt-pkg/sourcelist.cc:108
#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
#: apt-pkg/sourcelist.cc:206
#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
msgstr ""
#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
#: apt-pkg/sourcelist.cc:243
#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
#: apt-pkg/sourcelist.cc:247
#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@ -2416,17 +2427,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
#: apt-pkg/policy.cc:347
#: apt-pkg/policy.cc:316
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
#: apt-pkg/policy.cc:369
#: apt-pkg/policy.cc:338
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
#: apt-pkg/policy.cc:377
#: apt-pkg/policy.cc:346
msgid "No priority (or zero) specified for pin"
msgstr ""
@ -2510,16 +2521,16 @@ msgstr ""
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
#: apt-pkg/pkgcachegen.cc:693
#: apt-pkg/pkgcachegen.cc:706
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
#: apt-pkg/pkgcachegen.cc:778
#: apt-pkg/pkgcachegen.cc:808
msgid "Collecting File Provides"
msgstr ""
#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
msgid "IO Error saving source cache"
msgstr ""
@ -2528,39 +2539,39 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
#: apt-pkg/acquire-item.cc:395
#: apt-pkg/acquire-item.cc:432
msgid "MD5Sum mismatch"
msgstr ""
#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
msgid "Hash Sum mismatch"
msgstr ""
#: apt-pkg/acquire-item.cc:1106
#: apt-pkg/acquire-item.cc:1150
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
#: apt-pkg/acquire-item.cc:1216
#: apt-pkg/acquire-item.cc:1260
#, 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:1275
#: apt-pkg/acquire-item.cc:1319
#, 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:1316
#: apt-pkg/acquire-item.cc:1360
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
#: apt-pkg/acquire-item.cc:1403
#: apt-pkg/acquire-item.cc:1447
msgid "Size mismatch"
msgstr ""
@ -2802,8 +2813,18 @@ msgstr ""
msgid "Not locked"
msgstr ""
#: methods/rred.cc:219
msgid "Could not patch file"
#: methods/rred.cc:465
#, c-format
msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
#: methods/rred.cc:470
#, c-format
msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
#: methods/rsh.cc:330