summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-inst/contrib/extracttar.cc2
-rw-r--r--apt-inst/contrib/extracttar.h4
-rw-r--r--apt-inst/deb/dpkgdb.cc2
-rw-r--r--apt-pkg/acquire.h3
-rw-r--r--apt-pkg/clean.h1
-rw-r--r--apt-pkg/contrib/hashes.cc4
-rw-r--r--apt-pkg/contrib/hashes.h4
-rw-r--r--apt-pkg/contrib/md5.cc4
-rw-r--r--apt-pkg/contrib/md5.h2
-rw-r--r--apt-pkg/contrib/sha1.cc2
-rw-r--r--apt-pkg/contrib/sha1.h2
-rw-r--r--apt-pkg/indexcopy.h1
-rw-r--r--apt-pkg/indexfile.h1
-rw-r--r--buildlib/xml_manpage.mak2
-rw-r--r--cmdline/apt-get.cc9
-rw-r--r--configure.in2
-rwxr-xr-xdebian/bugscript2
-rw-r--r--debian/changelog35
-rw-r--r--doc/fr/apt.ent.fr2
-rw-r--r--doc/fr/makefile2
-rw-r--r--ftparchive/cachedb.h2
-rw-r--r--methods/ftp.cc2
-rw-r--r--methods/http.cc10
-rw-r--r--po/apt-all.pot110
-rw-r--r--po/cy.po2503
-rw-r--r--po/pt_BR.po149
26 files changed, 2712 insertions, 150 deletions
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 2585986d7..d6da802fe 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -309,7 +309,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
while (Size != 0)
{
unsigned char Junk[32*1024];
- unsigned long Read = MIN(Size,sizeof(Junk));
+ unsigned long Read = min(Size,(unsigned long)sizeof(Junk));
if (InFd.Read(Junk,((Read+511)/512)*512) == false)
return false;
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index ec930ca22..6daf00a27 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -21,6 +21,10 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/dirstream.h>
+#include <algorithm>
+
+using std::min;
+
class ExtractTar
{
protected:
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index 428d91303..c6a0e80e6 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -67,7 +67,7 @@ static bool EraseDir(const char *Dir)
if (Pid == 0)
{
execlp(_config->Find("Dir::Bin::rm","/bin/rm").c_str(),
- "rm","-rf","--",Dir,0);
+ "rm","-rf","--",Dir,(char *)NULL);
_exit(100);
}
return ExecWait(Pid,_config->Find("dir::bin::rm","/bin/rm").c_str());
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 3e338b220..27bb3d363 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -100,8 +100,7 @@ class pkgAcquire
enum RunResult {Continue,Failed,Cancelled};
- RunResult Run() { return Run(500000); }; // Binary compatibility
- RunResult Run(int PulseIntervall);
+ RunResult Run(int PulseIntervall=500000);
void Shutdown();
// Simple iteration mechanism
diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index ee65fcb61..43164e250 100644
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -25,6 +25,7 @@ class pkgArchiveCleaner
public:
bool Go(string Dir,pkgCache &Cache);
+ virtual ~pkgArchiveCleaner() {};
};
#endif
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index af741b672..b17b94319 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -30,8 +30,8 @@ bool Hashes::AddFD(int Fd,unsigned long Size)
int Res = 0;
while (Size != 0)
{
- Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
- if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
+ Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf)));
+ if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf)))
return false;
Size -= Res;
MD5.Add(Buf,Res);
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 481ea88f8..40bbe00a0 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -20,6 +20,10 @@
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
+#include <algorithm>
+
+using std::min;
+
class Hashes
{
public:
diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 2bd745153..fded5c864 100644
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -299,8 +299,8 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size)
int Res = 0;
while (Size != 0)
{
- Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
- if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
+ Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf)));
+ if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf)))
return false;
Size -= Res;
Add(Buf,Res);
diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 47c6a7cec..9e20f7cef 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -28,8 +28,10 @@
#endif
#include <string>
+#include <algorithm>
using std::string;
+using std::min;
class MD5Summation;
diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index 9b402c523..72eafd4ca 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -347,7 +347,7 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size)
while (Size != 0 || ToEOF)
{
unsigned n = sizeof(Buf);
- if (!ToEOF) n = MIN(Size,n);
+ if (!ToEOF) n = min(Size,(unsigned long)n);
Res = read(Fd,Buf,n);
if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
return false;
diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 7d25ceb0d..db8ca7893 100644
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -19,8 +19,10 @@
#endif
#include <string>
+#include <algorithm>
using std::string;
+using std::min;
class SHA1Summation;
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index fa8e9c156..4dcb2b46d 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -43,6 +43,7 @@ class IndexCopy
bool CopyPackages(string CDROM,string Name,vector<string> &List,
pkgCdromStatus *log);
+ virtual ~IndexCopy() {};
};
class PackageCopy : public IndexCopy
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index be02669fa..61049f4bd 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -55,6 +55,7 @@ class pkgIndexFile
virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator /*File*/) const {return 0;};
Type();
+ virtual ~Type() {};
};
virtual const Type *GetType() const = 0;
diff --git a/buildlib/xml_manpage.mak b/buildlib/xml_manpage.mak
index 57e95f303..c8b155d09 100644
--- a/buildlib/xml_manpage.mak
+++ b/buildlib/xml_manpage.mak
@@ -2,7 +2,7 @@
# This handles man pages in DocBook XML format. We convert to the respective
# output in the source directory then copy over to the final dest. This
-# means yodl is only needed if compiling from CVS
+# means xmlto is only needed if compiling from Arch
# Input
# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ae81af3e6..316bb7af9 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1380,6 +1380,15 @@ bool DoUpgrade(CommandLine &CmdL)
/* Install named packages */
bool DoInstall(CommandLine &CmdL)
{
+ // Lock the list directory
+ FileFd Lock;
+ if (_config->FindB("Debug::NoLocking",false) == false)
+ {
+ Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
+ if (_error->PendingError() == true)
+ return _error->Error(_("Unable to lock the list directory"));
+ }
+
CacheFile Cache;
if (Cache.OpenForInstall() == false ||
Cache.CheckDeps(CmdL.FileSize() != 1) == false)
diff --git a/configure.in b/configure.in
index e17a126ba..767399b52 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.35ubuntu1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.37")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/bugscript b/debian/bugscript
index 8423e07c2..f5ec9e05d 100755
--- a/debian/bugscript
+++ b/debian/bugscript
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
# reportbug #169495
if [ -z "$YESNO" ]; then
diff --git a/debian/changelog b/debian/changelog
index 87e713d3d..57b746a56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+apt (0.6.37) breezy; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81
+ - patch-66: Italian update
+ - patch-71: French update
+ - patch-73: Basque update
+ - patch-74: Hebrew update
+ - patch-76: Correct Hebrew translation (Closes: #306658)
+ - patch-77: French man page update
+ - patch-79: Correct syntax errors in Hebrew translation
+ - patch-81: Portuguese update
+ * Fix build of French man pages (now using XML, not SGML)
+ * Add Welsh translation from Dafydd Harries
+ (daf@muse.19inch.net--2005/apt--main--0--patch-1)
+ * Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 24 May 2005 14:38:25 -0700
+
+apt (0.6.36ubuntu1) breezy; urgency=low
+
+ * make it possible to write a cache-control: no-cache header even if
+ no proxy is set to support transparent proxies (closes ubuntu: #10773)
+
+ * Merge otavio@debian.org--2005/apt--fixes--0.6:
+ - Fix comment about the need of xmlto while building from Arch;
+ - Fix StatStore struct on cachedb.h to use time_t and then fix a compile
+ warning;
+ - Lock database at start of DoInstall routine to avoid concurrent
+ runs of install/remove and update commands (Closes: #194467)
+ - Fix warnings while compiling with GCC 4.0 compiler
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 23 May 2005 11:57:53 +0200
+
apt (0.6.36) experimental; urgency=low
* Merge apt--mvo--0:
@@ -9,7 +42,7 @@ apt (0.6.36) experimental; urgency=low
- apt-pkg/cdrom.cc:
honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
- -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 31 Mar 2005 20:37:11 +0200
+ -- Michael Vogt <mvo@debian.org> Thu, 31 Mar 2005 20:37:11 +0200
apt (0.6.35) hoary; urgency=low
diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index bf0df1827..075d85698 100644
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -1,4 +1,4 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
+<?xml version="1.0" encoding="iso-8859-15"?>
<!-- Some common paths.. -->
<!ENTITY docdir "/usr/share/doc/apt/">
diff --git a/doc/fr/makefile b/doc/fr/makefile
index 2b9278457..6544ee9e0 100644
--- a/doc/fr/makefile
+++ b/doc/fr/makefile
@@ -10,4 +10,4 @@ SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \
sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \
apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1
INCLUDES = apt.ent.fr
-include $(SGML_MANPAGE_H)
+include $(XML_MANPAGE_H)
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 1229b98ef..1b043e1aa 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -69,7 +69,7 @@ class CacheDB
enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2)};
struct StatStore
{
- uint32_t mtime;
+ time_t mtime;
uint32_t Flags;
} CurStat;
struct StatStore OldStat;
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 8bf8a2ee6..f595e0ca4 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1102,7 +1102,7 @@ int main(int argc,const char *argv[])
// Run the http method
string Path = flNotFile(argv[0]) + "http";
- execl(Path.c_str(),Path.c_str(),0);
+ execl(Path.c_str(),Path.c_str(),(char *)NULL);
cerr << _("Unable to invoke ") << Path << endl;
exit(100);
}
diff --git a/methods/http.cc b/methods/http.cc
index 81a64d7a3..ba86aa6b6 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -635,9 +635,9 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
and a no-store directive for archives. */
sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n",
Itm->Uri.c_str(),ProperHost.c_str());
- if (_config->FindB("Acquire::http::No-Cache",false) == true)
- strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
- else
+ // only generate a cache control header if we actually want to
+ // use a cache
+ if (_config->FindB("Acquire::http::No-Cache",false) == false)
{
if (Itm->IndexFile == true)
sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n",
@@ -649,6 +649,10 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
}
}
}
+ // generate a no-cache header if needed
+ if (_config->FindB("Acquire::http::No-Cache",false) == true)
+ strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
+
string Req = Buf;
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 311c47fdc..3936f3f16 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-03-29 07:17+0200\n"
+"POT-Creation-Date: 2005-05-23 11:34+0200\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"
@@ -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:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -523,7 +523,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -670,11 +670,11 @@ msgstr ""
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
@@ -728,7 +728,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -737,7 +737,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr ""
@@ -833,7 +833,7 @@ msgstr ""
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr ""
@@ -847,27 +847,27 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -875,149 +875,149 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1547
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:1543
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2217
#, 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:2243
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1561,7 +1561,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1688,43 +1688,43 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr ""
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr ""
diff --git a/po/cy.po b/po/cy.po
new file mode 100644
index 000000000..d8360fc3f
--- /dev/null
+++ b/po/cy.po
@@ -0,0 +1,2503 @@
+# APT yn Gymraeg: APT in Welsh.
+# This file is under the same licence as APT itself.
+# Dafydd Harries <daf@muse.19inch.net>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: APT\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-29 21:56-0700\n"
+"PO-Revision-Date: 2005-06-06 13:46+0100\n"
+"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
+"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cmdline/apt-cache.cc:133
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
+
+#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613
+#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1355
+#: cmdline/apt-cache.cc:1506
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ni ellir lleoli'r pecyn %s"
+
+#: cmdline/apt-cache.cc:230
+msgid "Total Package Names : "
+msgstr "Cyfanswm Enwau Pecynnau : "
+
+#: cmdline/apt-cache.cc:270
+msgid " Normal Packages: "
+msgstr " Pecynnau Normal: "
+
+#: cmdline/apt-cache.cc:271
+msgid " Pure Virtual Packages: "
+msgstr " Pecynnau Cwbl Rhithwir: "
+
+#: cmdline/apt-cache.cc:272
+msgid " Single Virtual Packages: "
+msgstr " Pecynnau Rhithwir Sengl: "
+
+#: cmdline/apt-cache.cc:273
+msgid " Mixed Virtual Packages: "
+msgstr " Pecynnau Rhithwir Cymysg: "
+
+#: cmdline/apt-cache.cc:274
+msgid " Missing: "
+msgstr " Ar Goll: "
+
+#: cmdline/apt-cache.cc:276
+msgid "Total Distinct Versions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "
+
+#: cmdline/apt-cache.cc:278
+msgid "Total Dependencies: "
+msgstr "Cyfanswm Dibyniaethau: "
+
+#: cmdline/apt-cache.cc:281
+msgid "Total Ver/File relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+
+#: cmdline/apt-cache.cc:283
+msgid "Total Provides Mappings: "
+msgstr "Cyfanswm Mapiau Darpariath: "
+
+#: cmdline/apt-cache.cc:295
+msgid "Total Globbed Strings: "
+msgstr "Cyfanswm Llinynau Glob: "
+
+#: cmdline/apt-cache.cc:309
+msgid "Total Dependency Version space: "
+msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
+
+#: cmdline/apt-cache.cc:314
+msgid "Total Slack space: "
+msgstr "Cyfanswm gofod Slac: "
+
+#: cmdline/apt-cache.cc:322
+msgid "Total Space Accounted for: "
+msgstr "Cyfanswm Gofod Cyfrifwyd: "
+
+#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
+
+#: cmdline/apt-cache.cc:1229
+msgid "You must give exactly one pattern"
+msgstr "Rhaid i chi ddarparu un patrwm yn union"
+
+#: cmdline/apt-cache.cc:1383
+msgid "No packages found"
+msgstr "Canfuwyd dim pecyn"
+
+#: cmdline/apt-cache.cc:1460
+msgid "Package Files:"
+msgstr "Ffeiliau Pecynnau:"
+
+#: cmdline/apt-cache.cc:1467 cmdline/apt-cache.cc:1553
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
+
+#: cmdline/apt-cache.cc:1468
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1480
+msgid "Pinned Packages:"
+msgstr "Pecynnau wedi eu Pinio:"
+
+#: cmdline/apt-cache.cc:1492 cmdline/apt-cache.cc:1533
+msgid "(not found)"
+msgstr "(heb ganfod)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1513
+msgid " Installed: "
+msgstr " Wedi Sefydlu: "
+
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1523
+msgid "(none)"
+msgstr "(dim)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1520
+msgid " Candidate: "
+msgstr " Ymgeisydd: "
+
+#: cmdline/apt-cache.cc:1530
+msgid " Package Pin: "
+msgstr " Pin Pecyn: "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1539
+msgid " Version Table:"
+msgstr " Tabl Fersiynnau:"
+
+#: cmdline/apt-cache.cc:1554
+#, c-format
+msgid " %4i %s\n"
+msgstr " %4i %s\n"
+
+#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
+#: cmdline/apt-get.cc:2299 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s %s compiled on %s %s\n"
+msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
+
+#: cmdline/apt-cache.cc:1588
+msgid ""
+"Usage: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+" add - Add a package file to the source cache\n"
+" gencaches - Build both the package and source cache\n"
+" showpkg - Show some general information for a single package\n"
+" showsrc - Show source records\n"
+" stats - Show some basic statistics\n"
+" dump - Show the entire file in a terse form\n"
+" dumpavail - Print an available file to stdout\n"
+" unmet - Show unmet dependencies\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"Defnydd: apt-cache [opsiynnau] gorchymyn\n"
+" apt-cache [opsiynnau] add ffeil1 [ffeil2 ...]\n"
+" apt-cache [opsiynnau] showpkg pecyn1 [pecyn2 ...]\n"
+" apt-cache [opsiynnau] showsrc pecyn1 [pecyn2 ...]\n"
+"\n"
+"Mae apt-cache yn erfyn lefel isel a ddefnyddir i ymdrin a ffeiliau storfa "
+"deuol APT, ac ymholi gwybodaeth ohonynt\n"
+"\n"
+"Gorchmynion:\n"
+" add - Ychwanegu ffeil pecyn i'r storfa ffynhonell\n"
+" gencaches - Adeiladu'r storfeydd pecyn a ffynhonell\n"
+" showpkg - Dangos gwybodaeth cyffredinol am becyn sengl\n"
+" showsrc - Dangos cofnodion ffynhonell\n"
+" stats - Dangos rhyw ystadegau sylfaenol\n"
+" dump - Dangos y ffeil cyfan mewn ffurf syml\n"
+" dumpavail - Dangos ffeil argaeledd\n"
+" unmet - Dangos dibyniaethau heb eu darparu\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "Nid yw ymresymiadau mewn parau"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+msgstr "Defnydd: apt-config [opsiynnau] gorchymyn\n"
+"\n"
+"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
+"\n"
+"Gorchmynion:\n"
+" shell - Modd plisgyn\n"
+" dump - Dangod y cyfluniad\n"
+"\n"
+"Opsiynnau:\n"
+" -h Y testun cymorth hwn\n"
+" -c=? Darllen y ffeil cyfluniad\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "Nid yw %s yn becyn DEB dilys."
+
+# FIXME: "debian"
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+" -h Dangos y testun cymorth hwn\n"
+" -t Gosod y cyfeiriadur dros dro\n"
+" -c=? Darllen y ffeil cyfluniad hwn\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
+
+#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337
+msgid "Package extension list is too long"
+msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
+
+#: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179
+#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
+#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
+#, c-format
+msgid "Error Processing directory %s"
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+
+#: ftparchive/apt-ftparchive.cc:250
+msgid "Source extension list is too long"
+msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
+
+#: ftparchive/apt-ftparchive.cc:367
+msgid "Error writing header to contents file"
+msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
+
+#: ftparchive/apt-ftparchive.cc:397
+#, c-format
+msgid "Error Processing Contents %s"
+msgstr "Gwall wrth Brosesu Cynnwys %s"
+
+# FIXME: full stops
+#: ftparchive/apt-ftparchive.cc:551
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitary configuration option"
+msgstr ""
+"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
+"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+" contents llwybr\n"
+" release llwybr\n"
+" generate cyfluniad [grŵpiau]\n"
+" clean cyfluniad\n"
+"\n"
+"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
+"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
+"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a "
+"dpkg-scansources.\n"
+"\n"
+"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
+"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
+"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
+"gorfodi'r gwerthoedd Priority a Section.\n"
+"\n"
+"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
+".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
+"gwrthwneud ffynhonell.\n"
+"\n"
+"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
+"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
+"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
+"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
+"defnydd o'r archif Debian:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opsiynnau:\n"
+" -h Y testun cymorth hwn\n"
+" --md5 Rheoli cynhyrchiad stwnch MD5\n"
+" -s=? Ffeil gwrthwneud ffynhonell\n"
+" -q Tawel\n"
+" -d=? Dewis cronda data storfa opsiynnol\n"
+" --no-delink Galluogi'r modd datgysylltu datnamu\n"
+" --contents Rheoli cynhyrchiad ffeil cynnwys\n"
+" -c=? Darllen y ffeil cyfluniad hwn\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol"
+
+#: ftparchive/apt-ftparchive.cc:757
+msgid "No selections matched"
+msgstr "Dim dewisiadau'n cyfateb"
+
+#: ftparchive/apt-ftparchive.cc:830
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'"
+
+#: ftparchive/cachedb.cc:45
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
+
+#: ftparchive/cachedb.cc:63
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
+
+#: ftparchive/cachedb.cc:73
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni ellir agor y ffeil DB2 %s: %s"
+
+#: ftparchive/cachedb.cc:114
+#, c-format
+msgid "File date has changed %s"
+msgstr "Dyddiad ffeil wedi newid %s"
+
+#: ftparchive/cachedb.cc:155
+msgid "Archive has no control record"
+msgstr "Does dim cofnod rheoli gan yr archif"
+
+#: ftparchive/cachedb.cc:267
+msgid "Unable to get a cursor"
+msgstr "Ni ellir cael cyrchydd"
+
+#: ftparchive/writer.cc:79
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
+
+#: ftparchive/writer.cc:84
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "Rh: Ni ellir gwneud stat() o %s\n"
+
+#: ftparchive/writer.cc:126
+msgid "E: "
+msgstr "G: "
+
+#: ftparchive/writer.cc:128
+msgid "W: "
+msgstr "Rh: "
+
+#: ftparchive/writer.cc:135
+msgid "E: Errors apply to file "
+msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
+
+#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Methwyd datrys %s"
+
+#: ftparchive/writer.cc:164
+msgid "Tree walking failed"
+msgstr "Methwyd cerdded y goeden"
+
+#: ftparchive/writer.cc:189
+#, c-format
+msgid "Failed to open %s"
+msgstr "Methwyd agor %s"
+
+# FIXME
+#: ftparchive/writer.cc:246
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DatGysylltu %s [%s]\n"
+
+#: ftparchive/writer.cc:254
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Methwyd darllen y cyswllt %s"
+
+#: ftparchive/writer.cc:258
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Methwyd datgysylltu %s"
+
+#: ftparchive/writer.cc:265
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Methwyd cysylltu %s at %s"
+
+#: ftparchive/writer.cc:275
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Tarwyd y terfyn cyswllt %sB.\n"
+
+#: ftparchive/writer.cc:352 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"
+
+#: ftparchive/writer.cc:372
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"
+
+#: ftparchive/writer.cc:380 ftparchive/writer.cc:589
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/writer.cc:423 ftparchive/writer.cc:671
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " Cynaliwr %s yw %s nid %s\n"
+
+#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Methwyd neilltuo cof"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"
+
+#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+
+#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+
+#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+
+#: ftparchive/multicompress.cc:75
+#, c-format
+msgid "Unknown Compresison Algorithm '%s'"
+msgstr "Dull Cywasgu Anhysbys '%s'"
+
+#: ftparchive/multicompress.cc:105
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+
+#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Methwyd creu pibell cyfathrebu at isbroses"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to create FILE*"
+msgstr "Methwyd creu FILE*"
+
+#: ftparchive/multicompress.cc:201
+msgid "Failed to fork"
+msgstr "Methodd fork()"
+
+#: ftparchive/multicompress.cc:215
+msgid "Compress Child"
+msgstr "Plentyn Cywasgu"
+
+#: ftparchive/multicompress.cc:238
+#, c-format
+msgid "Internal Error, Failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"
+
+#: ftparchive/multicompress.cc:289
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"
+
+#: ftparchive/multicompress.cc:324
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "
+
+#: ftparchive/multicompress.cc:363
+msgid "decompressor"
+msgstr "datgywasgydd"
+
+#: ftparchive/multicompress.cc:406
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"
+
+#: ftparchive/multicompress.cc:458
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"
+
+#: ftparchive/multicompress.cc:475
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Gwall wrth datgysylltu %s"
+
+#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"
+
+#: cmdline/apt-get.cc:118
+msgid "Y"
+msgstr "I"
+
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1466
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"
+
+#: cmdline/apt-get.cc:235
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+
+#: cmdline/apt-get.cc:325
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"
+
+#: cmdline/apt-get.cc:327
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-get.cc:334
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"
+
+#: cmdline/apt-get.cc:336
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"
+
+#: cmdline/apt-get.cc:339
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"
+
+#: cmdline/apt-get.cc:339
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"
+
+#: cmdline/apt-get.cc:344
+msgid " or"
+msgstr " neu"
+
+#: cmdline/apt-get.cc:373
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: cmdline/apt-get.cc:399
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+
+#: cmdline/apt-get.cc:421
+msgid "The following packages have been kept back"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+
+#: cmdline/apt-get.cc:442
+msgid "The following packages will be upgraded"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+
+#: cmdline/apt-get.cc:463
+msgid "The following packages will be DOWNGRADED"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+
+#: cmdline/apt-get.cc:483
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+
+#: cmdline/apt-get.cc:536
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (oherwydd %s) "
+
+#: cmdline/apt-get.cc:544
+msgid ""
+"WARNING: The following essential packages will be removed\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
+
+#: cmdline/apt-get.cc:575
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+
+#: cmdline/apt-get.cc:579
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "
+
+#: cmdline/apt-get.cc:581
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "
+
+#: cmdline/apt-get.cc:583
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+
+#: cmdline/apt-get.cc:587
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
+
+#: cmdline/apt-get.cc:647
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: cmdline/apt-get.cc:650
+msgid " failed."
+msgstr " wedi methu."
+
+#: cmdline/apt-get.cc:653
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: cmdline/apt-get.cc:656
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: cmdline/apt-get.cc:658
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: cmdline/apt-get.cc:662
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain."
+
+#: cmdline/apt-get.cc:665
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+
+#: cmdline/apt-get.cc:687
+msgid "WARNING: The following packages cannot be securely authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: cmdline/apt-get.cc:698
+msgid "Abort? [Y/n] "
+msgstr "Erthylu? [I/n] "
+
+#: cmdline/apt-get.cc:755
+msgid "Packages need to be removed but Remove is disabled."
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
+
+#: cmdline/apt-get.cc:781 cmdline/apt-get.cc:1755 cmdline/apt-get.cc:1788
+msgid "Unable to lock the download directory"
+msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
+
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1836 cmdline/apt-get.cc:2047
+#: apt-pkg/cachefile.cc:67
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."
+
+#: cmdline/apt-get.cc:811
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
+
+#: cmdline/apt-get.cc:814
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Mae angen cyrchu %sB o archifau.\n"
+
+#: cmdline/apt-get.cc:819
+#, c-format
+msgid "After unpacking %sB of additional disk space will be used.\n"
+msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
+
+#: cmdline/apt-get.cc:822
+#, c-format
+msgid "After unpacking %sB disk space will be freed.\n"
+msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
+
+#: cmdline/apt-get.cc:839
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Does dim digon o le rhydd gennych yn %s."
+
+#: cmdline/apt-get.cc:848
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+
+#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:874
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
+
+#: cmdline/apt-get.cc:856
+msgid "Yes, do as I say!"
+msgstr "Ie, gwna fel rydw i'n dweud!"
+
+#: cmdline/apt-get.cc:858
+#, c-format
+msgid ""
+"You are about to do something potentially harmful\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
+"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
+" ?]"
+
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:883
+msgid "Abort."
+msgstr "Erthylu."
+
+#: cmdline/apt-get.cc:879
+msgid "Do you want to continue? [Y/n] "
+msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
+
+#: cmdline/apt-get.cc:954 cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1945
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "Methwyd cyrchu %s %s\n"
+
+#: cmdline/apt-get.cc:972
+msgid "Some files failed to download"
+msgstr "Methodd rhai ffeiliau lawrlwytho"
+
+#: cmdline/apt-get.cc:973 cmdline/apt-get.cc:1954
+msgid "Download complete and in download only mode"
+msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
+
+#: cmdline/apt-get.cc:979
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
+"geidio defnyddio --fix-missing?"
+
+#: cmdline/apt-get.cc:983
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
+
+#: cmdline/apt-get.cc:988
+msgid "Unable to correct missing packages."
+msgstr "Ni ellir cywiro pecynnau ar goll."
+
+#: cmdline/apt-get.cc:989
+msgid "Aborting Install."
+msgstr "Yn Erthylu'r Sefydliad."
+
+#: cmdline/apt-get.cc:1022
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+
+#: cmdline/apt-get.cc:1032
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+
+#: cmdline/apt-get.cc:1050
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
+
+#: cmdline/apt-get.cc:1061
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
+
+#: cmdline/apt-get.cc:1073
+msgid " [Installed]"
+msgstr " [Sefydliwyd]"
+
+#: cmdline/apt-get.cc:1078
+msgid "You should explicitly select one to install."
+msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+
+# FIXME: punctuation
+#: cmdline/apt-get.cc:1083
+#, c-format
+msgid ""
+"Package %s has no available version, but exists in the database.\n"
+"This typically means that the package was mentioned in a dependency and\n"
+"never uploaded, has been obsoleted or is not available with the contents\n"
+"of sources.list\n"
+msgstr ""
+"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
+"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
+"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
+"ffeil sources.list.\n"
+
+#: cmdline/apt-get.cc:1103
+msgid "However the following packages replace it:"
+msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
+
+#: cmdline/apt-get.cc:1106
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+
+#: cmdline/apt-get.cc:1126
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
+
+#: cmdline/apt-get.cc:1134
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+
+#: cmdline/apt-get.cc:1161
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+
+#: cmdline/apt-get.cc:1163
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+
+#: cmdline/apt-get.cc:1169
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+
+#: cmdline/apt-get.cc:1279
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: cmdline/apt-get.cc:1292
+msgid "Unable to lock the list directory"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+
+#: cmdline/apt-get.cc:1344
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."
+
+#: cmdline/apt-get.cc:1363
+msgid "Internal Error, AllUpgrade broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1489
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc:1476
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+
+#: cmdline/apt-get.cc:1506
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
+
+# FIXME
+#: cmdline/apt-get.cc:1509
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim "
+"pecyn (neu penodwch ddatrys)"
+
+# FIXME: needs commas
+#: cmdline/apt-get.cc:1521
+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"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n"
+"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n"
+"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
+"heb gael eu symud allan o Incoming."
+
+# FIXME: commas, wrapping
+#: cmdline/apt-get.cc:1529
+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 ""
+"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
+"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
+
+#: cmdline/apt-get.cc:1534
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+
+#: cmdline/apt-get.cc:1537
+msgid "Broken packages"
+msgstr "Pecynnau wedi torri"
+
+#: cmdline/apt-get.cc:1563
+msgid "The following extra packages will be installed:"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+
+#: cmdline/apt-get.cc:1629
+msgid "Suggested packages:"
+msgstr "Pecynnau a awgrymmir:"
+
+#: cmdline/apt-get.cc:1630
+msgid "Recommended packages:"
+msgstr "Pecynnau a argymhellir:"
+
+#: cmdline/apt-get.cc:1650
+msgid "Calculating Upgrade... "
+msgstr "Yn Cyfrifo'r Uwchraddiad... "
+
+#: cmdline/apt-get.cc:1653 methods/ftp.cc:702 methods/connect.cc:99
+msgid "Failed"
+msgstr "Methwyd"
+
+#: cmdline/apt-get.cc:1658
+msgid "Done"
+msgstr "Wedi Gorffen"
+
+#: cmdline/apt-get.cc:1831
+msgid "Must specify at least one package to fetch source for"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+
+#: cmdline/apt-get.cc:1858 cmdline/apt-get.cc:2065
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
+
+#: cmdline/apt-get.cc:1905
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"
+
+#: cmdline/apt-get.cc:1910
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
+
+#: cmdline/apt-get.cc:1913
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
+
+#: cmdline/apt-get.cc:1919
+#, c-format
+msgid "Fetch Source %s\n"
+msgstr "Cyrchu Ffynhonell %s\n"
+
+#: cmdline/apt-get.cc:1950
+msgid "Failed to fetch some archives."
+msgstr "Methwyd cyrchu rhai archifau."
+
+#: cmdline/apt-get.cc:1978
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+
+#: cmdline/apt-get.cc:1990
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
+
+#: cmdline/apt-get.cc:2007
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
+
+#: cmdline/apt-get.cc:2026
+msgid "Child process failed"
+msgstr "Methodd proses plentyn"
+
+#: cmdline/apt-get.cc:2042
+msgid "Must specify at least one package to check builddeps for"
+msgstr "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
+
+#: cmdline/apt-get.cc:2070
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
+
+#: cmdline/apt-get.cc:2090
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+
+#: cmdline/apt-get.cc:2142
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
+
+#: cmdline/apt-get.cc:2194
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd ar "
+"gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
+
+#: cmdline/apt-get.cc:2229
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy newydd"
+
+#: cmdline/apt-get.cc:2254
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
+
+#: cmdline/apt-get.cc:2268
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
+
+#: cmdline/apt-get.cc:2272
+msgid "Failed to process build dependencies"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
+
+#: cmdline/apt-get.cc:2304
+msgid "Supported Modules:"
+msgstr "Modylau a Gynhelir:"
+
+# FIXME: split
+#: cmdline/apt-get.cc:2345
+msgid ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to continue if the integrity check fails\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+"Defnydd: apt-get [opsiynnau] gorchymyn\n"
+" apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
+" apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
+"\n"
+"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
+"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
+"ddefnyddir amlaf.\n"
+"\n"
+"Gorchmynion:\n"
+" update - Cyrchu rhestrau pecynnau newydd\n"
+" update - Uwchraddio pecynnau wedi sefydlu\n"
+" install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n"
+" remove - Tynnu pecynnau\n"
+" source - Lawrlwytho archifau ffynhonell\n"
+" build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n"
+" dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n"
+" dselect-upgrade - Dilyn dewisiadau dselect\n"
+" clean - Dileu ffeiliau archif wedi eu lawrlwytho\n"
+" autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n"
+" check - Gwirio fod dim dibyniaethau torredig\n"
+"\n"
+"Opsiynnau:\n"
+" -h Y testun cymorth hwn.\n"
+" -q Allbwn cofnodadwy - dim dangosydd cynydd\n"
+" -qq Dim allbwn ar wahan i wallau\n"
+" -d Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n"
+" -s Peidio gweithredu. Gwneir efelychiad trefn.\n"
+" -y Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n"
+" -f Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n"
+" -m Ceisio mynd ymlaen os methir dod o hyd i archifau\n"
+" -u Dangos rhestr o archifau a uwchraddir hefyd\n"
+" -b Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n"
+" -V Dangos rhifau fersiwn cyflawn\n"
+" -c=? Darllen y ffeil cyfluniad hwn\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+"\n"
+"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n"
+"fwy o wybodaeth ac opsiynnau.\n"
+"\n"
+" Mae gan yr APT hwn bŵerau buwch hudol.\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "Presennol "
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "Cyrchu:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Anwybyddu "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Gwall "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
+
+#: cmdline/acqprogress.cc:225
+msgid " [Working]"
+msgstr " [Gweithio]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media Change: Please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "Cofnod pecyn anhysbys!"
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
+"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+"\n"
+"Opsiynnau:\n"
+" -h Y testun cymorth hwn\n"
+" -s Defnyddio trefnu ffeil ffynhonell\n"
+" -c=? Darllen y ffeil cyfluniad hwn\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "Rhagosodiad gwael!"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y"
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu "
+"eto."
+
+#: dselect/update:30
+msgid "Merging Available information"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: apt-inst/contrib/extracttar.cc:115
+msgid "Failed to create pipes"
+msgstr "Methwyd creu pibau"
+
+#: apt-inst/contrib/extracttar.cc:140
+msgid "Failed to exec gzip "
+msgstr "Methwyd gweithredu gzip"
+
+#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203
+msgid "Corrupted archive"
+msgstr "Archif llygredig"
+
+#: apt-inst/contrib/extracttar.cc:192
+msgid "Tar Checksum failed, archive corrupted"
+msgstr "Methodd swm gwirio Tar, archif llygredig"
+
+#: apt-inst/contrib/extracttar.cc:295
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"
+
+#: apt-inst/contrib/arfile.cc:73
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:81
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"
+
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:131
+msgid "Archive is too short"
+msgstr "Mae'r archif yn rhy fyr"
+
+#: apt-inst/contrib/arfile.cc:135
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"
+
+#: apt-inst/filelist.cc:384
+msgid "DropNode called on still linked node"
+msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
+
+#: apt-inst/filelist.cc:416
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"
+
+#: apt-inst/filelist.cc:463
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"
+
+#: apt-inst/filelist.cc:468
+msgid "Internal Error in AddDiversion"
+msgstr "Gwall Mewnol yn AddDiversion"
+
+#: apt-inst/filelist.cc:481
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
+
+# FIXME: "the"
+#: apt-inst/filelist.cc:510
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+
+#: apt-inst/filelist.cc:553
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"
+
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#, c-format
+msgid "Failed write file %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "Mae'r llwybr %s yn rhy hir"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Yn dadbacio %s mwy nag unwaith"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "Mae'r llwybr yn rhy hir"
+
+# FIXME: wtf?
+#: apt-inst/extract.cc:417
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
+
+#: apt-inst/extract.cc:434
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
+
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
+#, c-format
+msgid "Unable to read %s"
+msgstr "Ni ellir darllen %s"
+
+#: apt-inst/extract.cc:494
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Ni ellir gwneud stat() o %s"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "Ni ellir creu %s"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "Methwyd stat() ar %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
+
+#. 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-pkg/pkgcachegen.cc:840
+msgid "Reading Package Lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
+
+# FIXME
+#: 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 "Gwall mewnol wrth gyrchu enw pecyn"
+
+#: apt-inst/deb/dpkgdb.cc:205
+msgid "Reading File Listing"
+msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#: 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 ""
+"Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn yna "
+"gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
+
+# FIXME
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal Error getting a Node"
+msgstr "Gwall Mewnol wrth gael Nôd"
+
+# FIXME: literal
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+
+#: 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"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal Error adding a diversion"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialize first"
+msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
+
+#: apt-inst/deb/dpkgdb.cc:386
+msgid "Reading File List"
+msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: Header, offset %lu"
+msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
+
+#: apt-inst/deb/debfile.cc:55
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
+
+#: apt-inst/deb/debfile.cc:72
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+
+#: apt-inst/deb/debfile.cc:104
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Methwyd newid i %s"
+
+#: apt-inst/deb/debfile.cc:125
+msgid "Internal Error, could not locate member"
+msgstr "Gwall Methwyd, methwyd lleoli aelod"
+
+#: apt-inst/deb/debfile.cc:158
+msgid "Failed to locate a valid control file"
+msgstr "Methwyd lleoli ffeil rheoli dilys"
+
+#: apt-inst/deb/debfile.cc:243
+msgid "Unparsible control file"
+msgstr "Ffeil rheoli ni ellir ei ramadegu"
+
+#: methods/cdrom.cc:113
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
+
+#: methods/cdrom.cc:122
+msgid ""
+"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
+"cannot be used to add new CDs"
+msgstr ""
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio "
+"apt-get update i ychwanegu CDau newydd."
+
+#: methods/cdrom.cc:130 methods/cdrom.cc:168
+msgid "Wrong CD"
+msgstr "CD Anghywir"
+
+#: methods/cdrom.cc:163
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei "
+"ddefnyddio."
+
+#: methods/cdrom.cc:177 methods/file.cc:77
+msgid "File not found"
+msgstr "Ffeil heb ei ganfod"
+
+#: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
+msgid "Failed to stat"
+msgstr "Methwyd stat()"
+
+#: methods/copy.cc:79 methods/gzip.cc:139
+msgid "Failed to set modification time"
+msgstr "Methwyd gosod amser newid"
+
+#: methods/file.cc:42
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "Yn mewngofnodi"
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "Ni ellir darganfod enw'r cymar"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "Ni ellir darganfod yr enw lleol"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "Server refused our connection and said: %s"
+msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae "
+"Acquire::ftp::ProxyLogin yn wag.)"
+
+# FIXME
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "Goramser cysylltu"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "Caeodd y gweinydd y cysylltiad"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190
+msgid "Read error"
+msgstr "Gwall darllen"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "Gorlifodd ateb y byffer."
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "Llygr protocol"
+
+#: methods/ftp.cc:446 methods/rsh.cc:232
+msgid "Write Error"
+msgstr "Gwall Ysgrifennu"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "Methwyd creu soced"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket"
+msgstr "Methwyd cysylltu soced goddefol"
+
+# FIXME
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "Methodd getaddrinfo gael soced gwrando"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "Methwyd rhwymo soced"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "Methwyd gwrando ar y soced"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "Methwyd canfod enw'r soced"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "Methwyd danfod gorchymyn PORT"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "Goramserodd cysylltiad y soced data"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "Methwyd derbyn cysylltiad"
+
+#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "Problem wrth stwnshio ffeil"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "Goramserodd soced data"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "Ymholiad"
+
+# FIXME
+#: methods/ftp.cc:1104
+msgid "Unable to invoke "
+msgstr "Methwyd gweithredu "
+
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"
+
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
+
+#: methods/connect.cc:92
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
+
+#: methods/connect.cc:104
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Methwyd cysylltu i %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:132 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "Yn cysylltu i %s"
+
+#: methods/connect.cc:163
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Methwyd datrys '%s'"
+
+#: methods/connect.cc:167
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Methiant dros dro yn datrys '%s'"
+
+#: methods/connect.cc:169
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+
+#: methods/connect.cc:216
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "Methwyd cysylltu i %s %s:"
+
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
+#: methods/gzip.cc:102
+#, c-format
+msgid "Read error from %s process"
+msgstr "Gwall darllen o broses %s"
+
+#: methods/http.cc:340
+msgid "Waiting for headers"
+msgstr "Yn aros am benawdau"
+
+#: methods/http.cc:486
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+
+#: methods/http.cc:494
+msgid "Bad header line"
+msgstr "Llinell pennawd gwael"
+
+#: methods/http.cc:513 methods/http.cc:520
+msgid "The http server sent an invalid reply header"
+msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
+
+#: methods/http.cc:549
+msgid "The http server sent an invalid Content-Length header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+
+#: methods/http.cc:564
+msgid "The http server sent an invalid Content-Range header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+
+#: methods/http.cc:566
+msgid "This http server has broken range support"
+msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
+
+#: methods/http.cc:590
+msgid "Unknown date format"
+msgstr "Fformat dyddiad anhysbys"
+
+#: methods/http.cc:733
+msgid "Select failed"
+msgstr "Methwyd dewis"
+
+#: methods/http.cc:738
+msgid "Connection timed out"
+msgstr "Goramserodd y cysylltiad"
+
+#: methods/http.cc:761
+msgid "Error writing to output file"
+msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+
+#: methods/http.cc:789
+msgid "Error writing to file"
+msgstr "Gwall wrth ysgrifennu at ffeil"
+
+#: methods/http.cc:814
+msgid "Error writing to the file"
+msgstr "Gwall wrth ysgrifennu at y ffeil"
+
+#: methods/http.cc:828
+msgid "Error reading from server Remote end closed connection"
+msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+
+#: methods/http.cc:830
+msgid "Error reading from server"
+msgstr "Gwall wrth ddarllen o'r gweinydd"
+
+#: methods/http.cc:1061
+msgid "Bad header Data"
+msgstr "Data pennawd gwael"
+
+#: methods/http.cc:1078
+msgid "Connection failed"
+msgstr "Methodd y cysylltiad"
+
+#: methods/http.cc:1169
+msgid "Internal error"
+msgstr "Gwall mewnol"
+
+#: apt-pkg/contrib/mmap.cc:82
+msgid "Can't mmap an empty file"
+msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+
+#: apt-pkg/contrib/mmap.cc:87
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
+
+#: apt-pkg/contrib/strutl.cc:941
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
+
+#: apt-pkg/contrib/configuration.cc:395
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:453
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/contrib/configuration.cc:471
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "Linell %d yn rhy hir (uchaf %d)"
+
+#: apt-pkg/contrib/configuration.cc:567
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
+
+# FIXME
+#: apt-pkg/contrib/configuration.cc:586
+#, c-format
+msgid "Syntax error %s:%u: Malformed Tag"
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+
+#: apt-pkg/contrib/configuration.cc:603
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
+
+#: apt-pkg/contrib/configuration.cc:643
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
+
+#: apt-pkg/contrib/configuration.cc:650
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
+
+#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+
+#: apt-pkg/contrib/configuration.cc:663
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+
+#: apt-pkg/contrib/configuration.cc:697
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
+
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Gwall!"
+
+#: apt-pkg/contrib/progress.cc:156
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Wedi Gorffen"
+
+# FIXME
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
+
+#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+
+#: apt-pkg/contrib/cmndline.cc:127
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
+
+#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
+
+#: apt-pkg/contrib/cmndline.cc:237
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:268
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"
+
+# FIXME: 'Sense'?
+#: apt-pkg/contrib/cmndline.cc:301
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
+
+#: apt-pkg/contrib/cmndline.cc:351
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"
+
+#: apt-pkg/contrib/cdromutl.cc:55
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
+
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Ni ellir newid i %s"
+
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"
+
+#: apt-pkg/contrib/fileutl.cc:80
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
+
+#: apt-pkg/contrib/fileutl.cc:85
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Methwyd agor y ffeil clo %s"
+
+#: apt-pkg/contrib/fileutl.cc:103
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
+
+#: apt-pkg/contrib/fileutl.cc:107
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Methwyd cael y clo %s"
+
+#: apt-pkg/contrib/fileutl.cc:358
+#, c-format
+msgid "Waited, for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"
+
+#: apt-pkg/contrib/fileutl.cc:368
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Derbyniodd is-broses %s wall segmentu."
+
+#: apt-pkg/contrib/fileutl.cc:371
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:373
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Gorffenodd is-broses %s yn annisgwyl"
+
+#: apt-pkg/contrib/fileutl.cc:417
+#, c-format
+msgid "Could not open file %s"
+msgstr "Methwyd agor ffeil %s"
+
+# FIXME
+#: apt-pkg/contrib/fileutl.cc:473
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr "o hyd %lu i ddarllen ond dim ar ôl"
+
+#: apt-pkg/contrib/fileutl.cc:491
+msgid "Write error"
+msgstr "Gwall ysgrifennu"
+
+# FIXME
+#: apt-pkg/contrib/fileutl.cc:503
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "o hyd %lu i ysgrifennu ond methwyd"
+
+#: apt-pkg/contrib/fileutl.cc:578
+msgid "Problem closing the file"
+msgstr "Gwall wrth gau'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:584
+msgid "Problem unlinking the file"
+msgstr "Gwall wrth dadgysylltu'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:595
+msgid "Problem syncing the file"
+msgstr "Gwall wrth gyfamseru'r ffeil"
+
+#: apt-pkg/pkgcache.cc:126
+msgid "Empty package cache"
+msgstr "Storfa pecyn gwag"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "The package cache file is corrupted"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+
+#: apt-pkg/pkgcache.cc:137
+msgid "The package cache file is an incompatible version"
+msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
+
+# FIXME: capitalisation?
+#: apt-pkg/pkgcache.cc:142
+#, c-format
+msgid "This APT does not support the Versioning System '%s'"
+msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
+
+#: apt-pkg/pkgcache.cc:147
+msgid "The package cache was built for a different architecture"
+msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Depends"
+msgstr "Dibynnu"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "PreDepends"
+msgstr "CynDdibynnu"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Suggests"
+msgstr "Awgrymu"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Recommends"
+msgstr "Argymell"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Conflicts"
+msgstr "Gwrthdaro"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Replaces"
+msgstr "Amnewid"
+
+#: apt-pkg/pkgcache.cc:220
+msgid "Obsoletes"
+msgstr "Darfodi"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "important"
+msgstr "pwysig"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "required"
+msgstr "angenrheidiol"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "standard"
+msgstr "safonnol"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "optional"
+msgstr "opsiynnol"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "extra"
+msgstr "ychwanegol"
+
+#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+msgid "Building Dependency Tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
+
+#: apt-pkg/depcache.cc:61
+msgid "Candidate Versions"
+msgstr "Fersiynau Posib"
+
+#: apt-pkg/depcache.cc:90
+msgid "Dependency Generation"
+msgstr "Cynhyrchaid Dibyniaeth"
+
+# FIXME: number?
+#: apt-pkg/tagfile.cc:73
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/tagfile.cc:160
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
+
+#: apt-pkg/sourcelist.cc:87
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
+
+#: apt-pkg/sourcelist.cc:89
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
+#: apt-pkg/sourcelist.cc:92
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:98
+#, c-format
+msgid "Malformed line %lu in source list %s (Absolute dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+
+#: apt-pkg/sourcelist.cc:105
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:156
+#, c-format
+msgid "Opening %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/sourcelist.cc:170
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/sourcelist.cc:187
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+
+#: apt-pkg/sourcelist.cc:191
+#, c-format
+msgid "Type '%s' is not known in on line %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
+# FIXME: %s may have an arbirrary length
+#: 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 ""
+"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
+"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych "
+"wir eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
+
+#: apt-pkg/pkgrecords.cc:37
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+
+#: apt-pkg/algorithms.cc:238
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar ei "
+"gyfer."
+
+#: apt-pkg/algorithms.cc:1056
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod "
+"wedi ei achosi gan pecynnau wedi eu dal."
+
+#: apt-pkg/algorithms.cc:1058
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
+
+#: apt-pkg/acquire.cc:61
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/acquire.cc:65
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
+
+#: apt-pkg/acquire-worker.cc:112
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
+
+#: apt-pkg/acquire-worker.cc:161
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
+
+#: apt-pkg/init.cc:119
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"
+
+#: apt-pkg/init.cc:135
+msgid "Unable to determine a suitable system type"
+msgstr "Ni ellir canfod math system addas"
+
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."
+
+# FIXME: ...file
+#: apt-pkg/srcrecords.cc:48
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
+
+#: apt-pkg/cachefile.cc:73
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
+
+#: apt-pkg/cachefile.cc:77
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
+
+# FIXME: literal
+#: apt-pkg/policy.cc:269
+msgid "Invalid record in the preferences file, no Package header"
+msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
+
+# FIXME: tense
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Methwyd daeall y math pin %s"
+
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
+
+#: apt-pkg/pkgcachegen.cc:74
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"
+
+#: apt-pkg/pkgcachegen.cc:117
+#, c-format
+msgid "Error occured while processing %s (NewPackage)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
+
+#: apt-pkg/pkgcachegen.cc:129
+#, c-format
+msgid "Error occured while processing %s (UsePackage1)"
+msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
+
+#: apt-pkg/pkgcachegen.cc:150
+#, c-format
+msgid "Error occured while processing %s (UsePackage2)"
+msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
+
+#: apt-pkg/pkgcachegen.cc:154
+#, c-format
+msgid "Error occured while processing %s (NewFileVer1)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:184
+#, c-format
+msgid "Error occured while processing %s (NewVersion1)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:188
+#, c-format
+msgid "Error occured while processing %s (UsePackage3)"
+msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
+
+#: apt-pkg/pkgcachegen.cc:192
+#, c-format
+msgid "Error occured while processing %s (NewVersion2)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
+
+#: apt-pkg/pkgcachegen.cc:207
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei "
+" drin."
+
+#: apt-pkg/pkgcachegen.cc:210
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:213
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:241
+#, c-format
+msgid "Error occured while processing %s (FindPkg)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:254
+#, c-format
+msgid "Error occured while processing %s (CollectFileProvides)"
+msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
+
+#: apt-pkg/pkgcachegen.cc:260
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+
+#: apt-pkg/pkgcachegen.cc:574
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#: apt-pkg/pkgcachegen.cc:658
+msgid "Collecting File Provides"
+msgstr "Yn Casglu Darpariaethau Ffeil"
+
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+
+#: apt-pkg/acquire-item.cc:126
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:205 apt-pkg/acquire-item.cc:817
+msgid "MD5Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"
+
+# FIXME: case
+#: apt-pkg/acquire-item.cc:654
+#, 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 ""
+"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
+"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
+
+#: apt-pkg/acquire-item.cc:689
+#, 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 ""
+"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
+"drwsio'r pecyn hyn a law."
+
+#: apt-pkg/acquire-item.cc:720
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
+
+#: apt-pkg/acquire-item.cc:807
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+
+#: methods/rsh.cc:264
+msgid "File Not Found"
+msgstr "Ni Chanfuwyd Y Ffeil"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8e1525db7..82271928b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,13 +6,13 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-29 07:17+0200\n"
-"PO-Revision-Date: 2005-02-13 15:18-0200\n"
+"Report-Msgid-Bugs-To: debian-l10n-portuguese@lists.debian.org\n"
+"POT-Creation-Date: 2005-05-23 11:34+0200\n"
+"PO-Revision-Date: 2005-06-16 10:24-0300\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#: cmdline/apt-cache.cc:135
@@ -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:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 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"
@@ -325,7 +325,6 @@ msgid "Error processing contents %s"
msgstr "Erro processando Conteúdo %s"
#: ftparchive/apt-ftparchive.cc:551
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -378,7 +377,7 @@ msgstr ""
"suporta muitos estilos de geração, desde totalmente automatizadas até \n"
"substitutos funcionais para o dpkg-scanpackages e dpkg-scansources\n"
"\n"
-"O apt-ftparchive gera arquivos Packages a partir de uma árvore de .debs.\n"
+"O apt-ftparchive gera arquivos Package a partir de uma árvore de .debs.\n"
" O arquivo Package contém o conteúdo de todos os campos control de \n"
"cada pacote bem como o hash MD5 e tamanho de arquivo. Um arquivo \n"
"override é suportado para forçar o valor de Priority e Section.\n"
@@ -623,7 +622,7 @@ msgstr "Falha ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -772,11 +771,11 @@ msgstr "Há problemas e -y foi usado sem --force-yes"
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Impossível criar lock no diretório de download"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: 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 +833,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Quer continuar [S/n] ? "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falha ao baixar %s %s\n"
@@ -843,7 +842,7 @@ msgstr "Falha ao baixar %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de apenas download"
@@ -946,7 +945,7 @@ msgstr "Versão selecionada %s (%s) para %s\n"
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Impossível criar lock no diretório de listas"
@@ -962,21 +961,21 @@ msgstr ""
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1524
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:1518
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -984,7 +983,7 @@ msgstr ""
"Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1539
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"
@@ -996,7 +995,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:1538
+#: cmdline/apt-get.cc:1547
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"
@@ -1006,107 +1005,107 @@ msgstr ""
"esteja simplesmente não instalável e um relato de erro sobre esse\n"
"pacotes deve ser enviado."
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1552
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:1546
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir serão instalados:"
-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr "Calculando Atualização... "
-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1854
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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1928
#, 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:1924
+#: cmdline/apt-get.cc:1933
#, 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:1927
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Precisa obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Fonte %s\n"
-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Falha ao fazer o download de alguns arquivos."
-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2001
#, 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:2004
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
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:2084
+#: cmdline/apt-get.cc:2093
#, 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:2104
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1115,7 +1114,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:2208
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1124,32 +1123,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:2243
+#: cmdline/apt-get.cc:2252
#, 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:2268
+#: cmdline/apt-get.cc:2277
#, 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:2282
+#: cmdline/apt-get.cc:2291
#, 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:2286
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependências de construção"
-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1549,7 +1548,7 @@ msgid "Internal error adding a diversion"
msgstr "Erro Interno ao adicionar um desvio"
#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialized first"
+msgid "The pkg cache must be initialize first"
msgstr "O cache de pacotes deve ser inicializado primeiro"
#: apt-inst/deb/dpkgdb.cc:386
@@ -1758,7 +1757,7 @@ msgstr "Conexão do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar conexão"
-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do arquivo"
@@ -1885,43 +1884,43 @@ msgstr "Este servidor http possui suporte a range quebrado"
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:737
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Seleção falhou."
-#: methods/http.cc:742
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:765
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Erro gravando para arquivo de saída"
-#: methods/http.cc:793
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Erro gravando para arquivo"
-#: methods/http.cc:818
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Erro gravando para o arquivo"
-#: methods/http.cc:832
+#: methods/http.cc:836
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor Ponto remoto fechou a conexão"
-#: methods/http.cc:834
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1065
+#: methods/http.cc:1069
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1082
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Conexão falhou."
-#: methods/http.cc:1173
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Erro interno"
@@ -2384,37 +2383,37 @@ msgstr "O Cache possui um sistema de versões incompatível"
#: apt-pkg/pkgcachegen.cc:117
#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
+msgid "Error occured while processing %s (NewPackage)"
msgstr "Um erro ocorreu processando %s (NovoPacote)"
#: apt-pkg/pkgcachegen.cc:129
#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
+msgid "Error occured while processing %s (UsePackage1)"
msgstr "Um erro ocorreu processando %s (UsePacote1)"
#: apt-pkg/pkgcachegen.cc:150
#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
+msgid "Error occured while processing %s (UsePackage2)"
msgstr "Um erro ocorreu processando %s (UsePacote2)"
#: apt-pkg/pkgcachegen.cc:154
#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
+msgid "Error occured while processing %s (NewFileVer1)"
msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
#: apt-pkg/pkgcachegen.cc:184
#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+msgid "Error occured while processing %s (NewVersion1)"
msgstr "Um erro ocorreu processando %s (NovaVersão1)"
#: apt-pkg/pkgcachegen.cc:188
#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
+msgid "Error occured while processing %s (UsePackage3)"
msgstr "Um erro ocorreu processando %s (UsePacote3)"
#: apt-pkg/pkgcachegen.cc:192
#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
+msgid "Error occured while processing %s (NewVersion2)"
msgstr "Um erro ocorreu processando %s (NovaVersão2)"
#: apt-pkg/pkgcachegen.cc:207
@@ -2435,12 +2434,12 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:241
#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
+msgid "Error occured while processing %s (FindPkg)"
msgstr "Um erro ocorreu processando %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
+msgid "Error occured while processing %s (CollectFileProvides)"
msgstr "Um erro ocorreu processando %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
@@ -2466,11 +2465,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:235 apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:708
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2480,7 +2479,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:761
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2489,7 +2488,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:797
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2497,7 +2496,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:884
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Tamanho incorreto"