summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/acquire-item.cc20
-rw-r--r--apt-pkg/acquire-item.h3
-rw-r--r--apt-pkg/acquire-worker.cc7
-rw-r--r--apt-pkg/pkgcachegen.cc2
-rw-r--r--cmdline/apt-get.cc19
-rw-r--r--configure.in2
-rw-r--r--debian/apt.cron.daily16
-rw-r--r--debian/changelog215
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules7
-rw-r--r--doc/examples/sources.list13
-rw-r--r--doc/ja/apt-ftparchive.ja.1.xml7
-rw-r--r--doc/ja/apt-secure.ja.8.xml6
-rw-r--r--po/ChangeLog12
-rw-r--r--po/pt.po152
-rw-r--r--po/ro.po205
-rw-r--r--po/tl.po73
17 files changed, 480 insertions, 281 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1fa929aad..da9becc44 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -75,7 +75,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
Dequeue();
return;
}
-
+
Status = StatError;
Dequeue();
}
@@ -321,8 +321,9 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
- // remove any partial downloaded sig-file. it may confuse proxies
- // and is too small to warrant a partial download anyway
+ // remove any partial downloaded sig-file in partial/.
+ // it may confuse proxies and is too small to warrant a
+ // partial download anyway
unlink(DestFile.c_str());
// Create the item
@@ -389,17 +390,22 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5,
/*}}}*/
void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
+ string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
// if we get a network error we fail gracefully
- if(LookupTag(Message,"FailReason") == "Timeout" ||
- LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
- LookupTag(Message,"FailReason") == "ConnectionRefused") {
+ if(Status == StatTransientNetworkError)
+ {
Item::Failed(Message,Cnf);
+ // move the sigfile back on network failures (and re-authenticated?)
+ if(FileExists(DestFile))
+ Rename(DestFile,Final);
+
+ // set the status back to , Item::Failed likes to reset it
+ Status = pkgAcquire::Item::StatTransientNetworkError;
return;
}
// Delete any existing sigfile when the acquire failed
- string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
unlink(Final.c_str());
// queue a pkgAcqMetaIndex with no sigfile
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index da1bea801..1c83f8d2e 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -48,7 +48,8 @@ class pkgAcquire::Item
public:
// State of the item
- enum {StatIdle, StatFetching, StatDone, StatError, StatAuthError} Status;
+ enum {StatIdle, StatFetching, StatDone, StatError,
+ StatAuthError, StatTransientNetworkError} Status;
string ErrorText;
unsigned long FileSize;
unsigned long PartialSize;
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index d06024178..8ab67778b 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -307,6 +307,13 @@ bool pkgAcquire::Worker::RunMessages()
pkgAcquire::Item *Owner = Itm->Owner;
pkgAcquire::ItemDesc Desc = *Itm;
OwnerQ->ItemDone(Itm);
+
+ // set some status
+ if(LookupTag(Message,"FailReason") == "Timeout" ||
+ LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
+ LookupTag(Message,"FailReason") == "ConnectionRefused")
+ Owner->Status = pkgAcquire::Item::StatTransientNetworkError;
+
Owner->Failed(Message,Config);
ItemDone();
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index de854bee5..de5ba5ea6 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -571,8 +571,10 @@ static bool CheckValidity(const string &CacheFile, FileIterator Start,
if ((*Start)->Exists() == false)
{
+#if 0 // mvo: we no longer give a message here (Default Sources spec)
_error->WarningE("stat",_("Couldn't stat source package list %s"),
(*Start)->Describe().c_str());
+#endif
continue;
}
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d4a6bee32..e98d4fec5 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1355,20 +1355,29 @@ bool DoUpdate(CommandLine &CmdL)
return false;
bool Failed = false;
+ bool TransientNetworkFailure = false;
for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); I++)
{
if ((*I)->Status == pkgAcquire::Item::StatDone)
continue;
(*I)->Finished();
-
+
fprintf(stderr,_("Failed to fetch %s %s\n"),(*I)->DescURI().c_str(),
(*I)->ErrorText.c_str());
+
+ if ((*I)->Status == pkgAcquire::Item::StatTransientNetworkError)
+ {
+ TransientNetworkFailure = true;
+ continue;
+ }
+
Failed = true;
}
// Clean out any old list files
- if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true)
+ if (!TransientNetworkFailure &&
+ _config->FindB("APT::Get::List-Cleanup",true) == true)
{
if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false ||
Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false)
@@ -1380,9 +1389,11 @@ bool DoUpdate(CommandLine &CmdL)
if (Cache.BuildCaches() == false)
return false;
- if (Failed == true)
+ if (TransientNetworkFailure == true)
+ _error->Warning(_("Some index files failed to download, they have been ignored, or old ones used instead."));
+ else if (Failed == true)
return _error->Error(_("Some index files failed to download, they have been ignored, or old ones used instead."));
-
+
return true;
}
/*}}}*/
diff --git a/configure.in b/configure.in
index 8d4b99904..ad22d01c0 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.43.3")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2ubuntu2")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 26dfa2530..b4cbf1c8a 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -14,6 +14,12 @@
# "APT::Periodic::AutocleanInterval"
# - Do "apt-get autoclean" every n-days (0=disable)
#
+# "APT::Periodic::Unattended-Upgrade"
+# - Run the "unattended-upgrade" security upgrade script
+# every n-days (0=disabled)
+# Requires the package "unattended-upgrades" and will write
+# a log in /var/log/unattended-upgrades
+#
# "APT::Archives::MaxAge",
# - Set maximum allowed age of a cache package file. If a cache
# package file is older it is deleted (0=disable)
@@ -148,6 +154,10 @@ eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists Downl
AutocleanInterval=$DownloadUpgradeableInterval
eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean)
+UnattendedUpgradeInterval=0
+eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade)
+
+
# laptop check, on_ac_power returns:
# 0 (true) System is on mains power
# 1 (false) System is not on mains power
@@ -182,5 +192,11 @@ if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
update_stamp $AUTOCLEAN_STAMP
fi
+UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
+if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
+ unattended-upgrade
+ update_stamp $UPGRADE_STAMP
+fi
+
# check cache size
check_size_constraints
diff --git a/debian/changelog b/debian/changelog
index 64c743a7f..89d418572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,26 @@
-apt (0.6.43.3) unstable; urgency=low
+apt (0.6.43.2ubuntu2) dapper; urgency=low
- * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
- * ca.po: Completed to 512t. Closes: #351592
+ * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 19:16:23 +0200
+
+apt (0.6.43.2ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+ * ca.po: Completed to 512t. Closes: #351592
* eu.po: Completed to 512t. Closes: #350483
* ja.po: Completed to 512t. Closes: #349806
* pl.po: Completed to 512t. Closes: #349514
* sk.po: Completed to 512t. Closes: #349474
* gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
* sv.po: Completed to 512 strings Closes: #349210
* ru.po: Completed to 512 strings Closes: #349154
* da.po: Completed to 512 strings Closes: #349084
* fr.po: Completed to 512 strings
- * vi.po: Completed to 511 strings Closes: #348968
- * zh_CN.po: Completed to 512t. Closes: #353936
- * it.po: Completed to 512t. Closes: #352803
- * pt_BR.po: Completed to 512t. Closes: #352419
* LINGUAS: Add Welsh
* *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
* apt-pkg/deb/deblistparser.cc:
- don't explode on a DepCompareOp in a Provides line, but warn about
it and ignore it otherwise (thanks to James Troup for reporting it)
@@ -27,8 +31,10 @@ apt (0.6.43.3) unstable; urgency=low
* make apt-cache madison work without deb-src entries (#352583)
* cmdline/apt-get.cc: only run the list-cleaner if a update was
successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
- -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100
apt (0.6.43.2) unstable; urgency=low
@@ -53,8 +59,26 @@ apt (0.6.43.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
-apt (0.6.43.1) unstable; urgency=low
+apt (0.6.43.1ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+ - en_GB.po, de.po: fix spaces errors in "Ign " translations
+ Closes: #347258
+ - makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+ - sv.po: Completed to 511t. Closes: #346450
+ - sk.po: Completed to 511t. Closes: #346369
+ - fr.po: Completed to 511t
+ - *.po: Updated from sources (511 strings)
+ * add patch to fix http download corruption problem (thanks to
+ Petr Vandrovec, closes: #280844, #290694)
+ * added APT::Periodic::Unattended-Upgrade (requires the package
+ "unattended-upgrade")
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+
+apt (0.6.43.1) unstable; urgency=low
+
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
* fr.po: Completed to 510 strings
* it.po: Completed to 510t
@@ -76,6 +100,19 @@ apt (0.6.43.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100
+apt (0.6.43ubuntu2) dapper; urgency=low
+
+ * merged some missing bits that wheren't merged by baz in the previous
+ upload (*grumble*)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100
+
+apt (0.6.43ubuntu1) dapper; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100
+
apt (0.6.43) unstable; urgency=medium
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:
@@ -96,6 +133,22 @@ apt (0.6.43) unstable; urgency=medium
-- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
+apt (0.6.42.3ubuntu2) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:
+ * zh_CN.po: Completed to 507 strings(Closes: #338267)
+ * gl.po: Completed to 510 strings (Closes: #338356)
+ * added support for "/etc/apt/sources.list.d" directory
+ (closes: #66325)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100
+
+apt (0.6.42.3ubuntu1) dapper; urgency=low
+
+ * synced with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100
+
apt (0.6.42.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
@@ -143,13 +196,13 @@ apt (0.6.42) unstable; urgency=low
- unmount the cdrom when apt failed to locate any package files
* allow cdrom failures and fallback to other sources in that case
(closes: #44135)
- * better error text when dpkg-source fails
+ * better error text when dpkg-source fails
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
- patch-99: Added Galician translation
- patch-100: Completed Danish translation (Closes: #325686)
- patch-104: French translation completed
- patch-109: Italian translation completed
- - patch-112: Swedish translation update
+ - patch-112: Swedish translation update
- patch-115: Basque translation completed (Closes: #333299)
* applied french man-page update (thanks to Philippe Batailler)
(closes: #316638, #327456)
@@ -163,12 +216,12 @@ apt (0.6.42) unstable; urgency=low
* apt-pkg/contrib/md5.cc:
- fix a alignment problem on sparc64 that gives random bus errors
(thanks to Fabbione for providing a test-case)
- * init the default ScreenWidth to 79 columns by default
+ * init the default ScreenWidth to 79 columns by default
(Closes: #324921)
- * cmdline/apt-cdrom.cc:
+ * cmdline/apt-cdrom.cc:
- fix some missing gettext() calls (closes: #334539)
* doc/apt-cache.8.xml: fix typo (closes: #334714)
-
+
-- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2005 22:02:09 +0200
apt (0.6.41) unstable; urgency=low
@@ -176,8 +229,8 @@ apt (0.6.41) unstable; urgency=low
* improved the support for "error" and "conffile" reporting from
dpkg, added the format to README.progress-reporting
* added README.progress-reporting to the apt-doc package
- * improved the network timeout handling, if a index file from a
- sources.list times out or EAI_AGAIN is returned from getaddrinfo,
+ * improved the network timeout handling, if a index file from a
+ sources.list times out or EAI_AGAIN is returned from getaddrinfo,
don't try to get the other files from that entry
* Support architecture-specific extra overrides
(closes: #225947). Thanks to Anthony Towns for idea and
@@ -185,10 +238,10 @@ apt (0.6.41) unstable; urgency=low
* Javier Fernandez-Sanguino Pen~a:
- Added a first version of an apt-secure.8 manpage, and modified
apt-key and apt.end accordingly. Also added the 'update'
- argument to apt-key which was previously not documented
+ argument to apt-key which was previously not documented
(Closes: #322120)
* Andreas Pakulat:
- - added example apt-ftparchive.conf file to doc/examples
+ - added example apt-ftparchive.conf file to doc/examples
(closes: #322483)
* Fix a incorrect example in the man-page (closes: #282918)
* Fix a bug for very long lines in the apt-cdrom code (closes: #280356)
@@ -197,10 +250,84 @@ apt (0.6.41) unstable; urgency=low
* Change pkgPolicy::Pin from private to protected to let subclasses
access it too (closes: #321799)
* add default constructor for PrvIterator (closes: #322267)
- * Reread status configuration on debSystem::Initialize()
+ * Reread status configuration on debSystem::Initialize()
(needed for apt-proxy, thanks to Otavio for this patch)
-
+
-- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200
+
+apt (0.6.40.1ubuntu8) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
+ - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
+ * po/de.po, po/fr.po:
+ - updated the translations
+ * po/makefile:
+ - create a single pot file in each domain dir to make rosetta happy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200
+
+apt (0.6.40.1ubuntu7) breezy; urgency=low
+
+ * updated the pot/po files , no code changes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200
+
+apt (0.6.40.1ubuntu6) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
+ - make it possible for apt to handle a failed MediaChange event and
+ fall back to other sources (ubuntu #13713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200
+
+apt (0.6.40.1ubuntu5) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
+ This adds media-change reporting to the apt status-fd (ubuntu #15213)
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
+ apt-pkg/cdrom.cc:
+ - unmount the cdrom when apt failed to locate any package files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200
+
+apt (0.6.40.1ubuntu4) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - fix a embarrassing typo
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200
+
+apt (0.6.40.1ubuntu3) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use the ctime as well when figuring what packages need to
+ be removed. This fixes the problem that packages copied with
+ "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200
+
+apt (0.6.40.1ubuntu2) breezy; urgency=low
+
+ * improved the support for "error" and "conffile" reporting from
+ dpkg, added the format to README.progress-reporting
+ * added README.progress-reporting to the apt-doc package
+ * Do md5sum checking for file and cdrom method (closes: #319142)
+ * Change pkgPolicy::Pin from private to protected to let subclasses
+ access it too (closes: #321799)
+ * methods/connect.cc:
+ - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
+ * apt-pkg/acquire-item.cc:
+ - fail early if a FailReason is TmpResolveFailure (avoids hangs during
+ the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
+
+apt (0.6.40.1ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
apt (0.6.40.1) unstable; urgency=low
@@ -211,6 +338,12 @@ apt (0.6.40.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
+apt (0.6.40ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
+
apt (0.6.40) unstable; urgency=low
* Patch from Jordi Mallach to mark some additional strings for translation
@@ -226,6 +359,39 @@ apt (0.6.40) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700
+apt (0.6.39ubuntu4) breezy; urgency=low
+
+ * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
+ before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu3) breezy; urgency=low
+
+ * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+ /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+ * Michael Vogt
+ - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ - Fix a incorrect example in the man-page (closes: #282918)
+ - Support architecture-specific extra overrides
+ (closes: #225947). Thanks to Anthony Towns for idea and
+ the patch, thanks to Colin Watson for testing it.
+ - better report network timeouts from the methods to the acuire code,
+ only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700
+
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -236,7 +402,14 @@ apt (0.6.39) unstable; urgency=low
* Update priority of apt-utils to important, to match the override file
* Install only one keyring on each branch (Closes: #316119)
- -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
+ -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:35:21 -0700
+
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
apt (0.6.38) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3b8883f88..4f3863d72 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Depends: ${shlibs:Depends}
Priority: important
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
-Recommends: debian-archive-keyring
+Recommends: ubuntu-keyring
Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
Section: admin
Description: Advanced front-end for dpkg
diff --git a/debian/rules b/debian/rules
index cd026b4a4..34c947c69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -213,6 +213,11 @@ apt: build debian/shlibs.local
# head -n 500 ChangeLog > debian/ChangeLog
+ # make rosetta happy and remove pot files in po/ (but leave stuff
+ # in po/domains/* untouched) and cp *.po into each domain dir
+ rm -f build/po/*.pot
+ rm -f po/*.pot
+
dh_installexamples -p$@ $(BLD)/docs/examples/*
dh_installman -p$@
dh_installcron -p$@
@@ -337,4 +342,4 @@ arch-build:
mkdir -p debian/arch-build/apt-$(APT_DEBVER)
baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER)
$(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc
- (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG))
+ (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index 9f2343277..a958899ae 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -1,10 +1,11 @@
# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
# CDROMs are managed through the apt-cdrom tool.
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
-deb http://security.debian.org stable/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu dapper main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu dapper main restricted
-# Uncomment if you want the apt-get source function to work
-#deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+deb http://security.ubuntu.com/ubuntu dapper-security main restricted
+deb-src http://security.ubuntu.com/ubuntu dapper-security main restricted
+
+deb http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu dapper-updates main restricted
diff --git a/doc/ja/apt-ftparchive.ja.1.xml b/doc/ja/apt-ftparchive.ja.1.xml
index 82bd9c023..be6bbd767 100644
--- a/doc/ja/apt-ftparchive.ja.1.xml
+++ b/doc/ja/apt-ftparchive.ja.1.xml
@@ -90,7 +90,8 @@
<para>本質的に <command>apt-ftparchive</command> は、
.deb ファイルの内容をキャッシュするのにバイナリデータベースを使用できます。
また、&gzip; 以外のいかなる外部プログラムにも依存しません。
- すべて生成する際、</para>
+ すべて生成する際には、
+ ファイル変更点の検出と希望した圧縮出力ファイルの作成を自動的に実行します。</para>
<!--
<para>Unless the <option>-h</option>, or <option>-\-help</option> option is given one of the
@@ -140,7 +141,7 @@
looked for with an extension of .src. The -\-source-override option can be
used to change the source override file that will be used.</para></listitem>
-->
- override ファイルを指定した場合、.
+ override ファイルを指定した場合、
src 拡張子がついたソースオーバーライドファイルを探します。
使用するソースオーバーライドファイルを変更するのには、
--source-override オプションを使用します。</para></listitem>
@@ -833,7 +834,7 @@ for i in Sections do
という形式か、単純に
<literallayout>new</literallayout>
となります。
- 最初の形式は、// で区切られた古いemail アドレスのリストを許可します。
+ 最初の形式は、// で区切られた古い email アドレスのリストを許可します。
この形式がある場合は、メンテナフィールドになるよう new に置換してください。
2 番目の形式は無条件にメンテナフィールドに置換します。</para>
</refsect1>
diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml
index 33a829076..5b9612a7f 100644
--- a/doc/ja/apt-secure.ja.8.xml
+++ b/doc/ja/apt-secure.ja.8.xml
@@ -100,7 +100,7 @@
responsibility to ensure that the archive integrity is correct.
-->
apt アーカイブからエンドユーザまでの信頼の輪は、
- いくつかのステップでo区政されています。
+ いくつかのステップで構成されています。
<command>apt-secure</command> は、この輪の最後のステップで、
アーカイブを信頼することは、
パッケージに悪意のあるコードが含まれていないと信頼するわけではありませんが、
@@ -182,7 +182,7 @@
per package basis. It is designed to prevent two possible attacks:
-->
<para>以上は、パッケージごとの署名チェックとは違うことに注意してください。
- 以下の用に考えられる 2 種類の攻撃を防ぐよう設計されています。
+ 以下のように考えられる 2 種類の攻撃を防ぐよう設計されています。
</para>
<itemizedlist>
@@ -243,7 +243,7 @@
<command>apt-key</command> は、
apt が使用するキーリストを管理するプログラムです。
このリリースのインストールでは、Debian パッケージリポジトリで使用する、
- キーで署名する デフォルトの Debian アーカイブを提供しますが、
+ キーで署名するデフォルトの Debian アーカイブを提供しますが、
<command>apt-key</command> でキーの追加・削除が行えます。
</para>
<para>
diff --git a/po/ChangeLog b/po/ChangeLog
index 0767deb75..e8501775e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2006-03-16 eric pareja <xenos@upm.edu.ph>
+
+ * tl.po: Completed to 512t. Closes: #357215
+
+2006-03-13 Sorin Batariuc <sorin@bonbon.net>
+
+ * ro.po: Completed to 512t. Closes: #355897
+
+2006-03-12 Miguel Figueiredo <elmig@debianpt.org>
+
+ * pt.po: Completed to 512t. Closes: #355798
+
2006-02-14 Carlos Z.F. Liu <carlosliu@users.sourceforge.net>
* zh_CN.po: Completed to 512t. Closes: #353936
diff --git a/po/pt.po b/po/pt.po
index 98150e94d..e7874c290 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,14 +1,13 @@
# Debian-PT translation for apt.
# Copyright (C) 2004 Free Software Foundation, Inc.
-# Miguel Figueiredo <elmig@debianpt.org>, 2003.
-# 2005-03-07 - Miguel Figueiredo <elmig@debianpt.org> - Fxed 1 new fuzzy.
+# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006.
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-03-07 22:20+0000\n"
-"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
+"Last-Translator: Rui Az. <astronomy@mail.pt>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -102,7 +101,7 @@ msgstr "Ficheiros de Pacotes :"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-"a cache está dessíncronizada, não pode x-referênciar um ficheiro de pacote"
+"A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote"
#: cmdline/apt-cache.cc:1470
#, c-format
@@ -230,17 +229,15 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
msgstr ""
+"Por favor forneça um nome para este Disco, tal como 'Debian 2.1r1 Disco 1'"
#: cmdline/apt-cdrom.cc:93
-#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e "
-"pressione enter\n"
+msgstr "Por favor insira um Disco no leitor e pressione enter"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Repita este processo para o resto dos CDs no seu conjunto."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -399,7 +396,7 @@ msgstr ""
"árvore de .dscs. A opção --source-override pode ser utilizada para \n"
"especificar um ficheiro override de fontes\n"
"\n"
-"Os comandos 'packages' e 'sources' devem ser executados na raíz da \n"
+"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n"
"árvore. CaminhoBinário deve apontar para a base de procura recursiva \n"
"e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n"
"incluído aos campos filename caso esteja presente. Exemplo de uso do \n"
@@ -704,14 +701,12 @@ msgid "%s (due to %s) "
msgstr "%s (devido a %s) "
#: cmdline/apt-get.cc:546
-#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"AVISO: Os seguintes pacotes essenciais serão removidos\n"
-"Isso NÃO deve ser feito a menos que você saiba exactamente o que está a "
-"fazer!"
+"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
+"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
#: cmdline/apt-get.cc:577
#, c-format
@@ -772,7 +767,7 @@ msgstr "AVISO: Os seguintes pacotes não podem ser autenticados"
#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Aviso de autenticação ultrapassado.\n"
#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
@@ -780,7 +775,7 @@ msgstr "Instalar estes pacotes sem verificação [y/N]? "
#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
-msgstr "Alguns pacotes não poderam ser autenticados"
+msgstr "Alguns pacotes não puderam ser autenticados"
#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
@@ -788,16 +783,15 @@ msgstr "Há problemas e -y foi usado sem --force-yes"
#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
#: cmdline/apt-get.cc:775
-#, fuzzy
msgid "Internal error, Ordering didn't finish"
-msgstr "Erro Interno ao adicionar um desvio"
+msgstr "Erro Interno, Ordering não terminou"
#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
@@ -811,6 +805,7 @@ msgstr "A lista de fontes não pôde ser lida."
#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org"
#: cmdline/apt-get.cc:821
#, c-format
@@ -826,7 +821,7 @@ msgstr "É necessário fazer o download de %sB de arquivos.\n"
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-"Depois descompactar, %sB adicionais de espaço em disco serão utilizados.\n"
+"Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n"
#: cmdline/apt-get.cc:832
#, c-format
@@ -834,9 +829,9 @@ msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n"
#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Desculpe, você não tem espaço suficiente em %s"
+msgstr "Impossível de determinar espaço livre em %s"
#: cmdline/apt-get.cc:849
#, c-format
@@ -852,13 +847,13 @@ msgid "Yes, do as I say!"
msgstr "Sim, faça como eu digo!"
#: cmdline/apt-get.cc:868
-#, fuzzy, c-format
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Você está prestes a fazer algo potencialmente prejudicial\n"
+"Você está prestes a fazer algo potencialmente nocivo.\n"
"Para continuar escreva a frase '%s'\n"
" ?] "
@@ -929,7 +924,7 @@ msgstr " [Instalado]"
#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
-msgstr "Você deve selecionar explicitamente um para instalar."
+msgstr "Você deve seleccionar explicitamente um para instalar."
#: cmdline/apt-get.cc:1091
#, c-format
@@ -944,7 +939,7 @@ msgstr ""
#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
-msgstr "No entanto, os seguintes pacotes substituem-o:"
+msgstr "No entanto, os seguintes pacotes substituem-no:"
#: cmdline/apt-get.cc:1113
#, c-format
@@ -1029,7 +1024,7 @@ msgid ""
msgstr ""
"Alguns pacotes não puderam ser instalados. Isso pode significar que\n"
"você solicitou uma situação impossível ou se você está a usar a\n"
-"distribuição instável, que alguns pacotes requesitados ainda não foram \n"
+"distribuição instável, que alguns pacotes requisitados ainda não foram \n"
"criados ou foram tirados do Incoming."
#: cmdline/apt-get.cc:1578
@@ -1038,7 +1033,7 @@ msgid ""
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"Já que você requisitou uma única operação é extremamanete provável que o \n"
+"Já que você requisitou uma única operação é extremamente provável que o \n"
"pacote esteja simplesmente não instalável e deve ser enviado um relatório "
"de\n"
"bug sobre esse pacote."
@@ -1076,9 +1071,8 @@ msgid "Done"
msgstr "Pronto"
#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
-#, fuzzy
msgid "Internal error, problem resolver broke stuff"
-msgstr "Erro Interno, AllUpgrade quebrou as coisas"
+msgstr "Erro Interno, o solucionador de problemas estragou coisas"
#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
@@ -1091,10 +1085,9 @@ msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote de código fonte para %s"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
+#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr ""
-"Saltando a descompactação de pacote código fonte já descompactado em %s\n"
+msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1134,7 +1127,7 @@ msgstr "O comando de descompactação '%s' falhou.\n"
#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
#: cmdline/apt-get.cc:2086
#, c-format
@@ -1167,7 +1160,7 @@ msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
+"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:2273
@@ -1177,7 +1170,7 @@ msgid ""
"package %s can satisfy version requirements"
msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
-"disponível do pacote %s pode satisfazer os requesitos de versão"
+"disponível do pacote %s pode satisfazer os requisitos de versão"
#: cmdline/apt-get.cc:2308
#, c-format
@@ -1424,7 +1417,7 @@ msgstr "Arquivo é demasiado pequeno"
#: apt-inst/contrib/arfile.cc:135
msgid "Failed to read the archive headers"
-msgstr "Falha ao ler os cabeçahos do arquivo"
+msgstr "Falha ao ler os cabeçalhos do arquivo"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
@@ -1445,7 +1438,7 @@ msgstr "Erro Interno em AddDiversion"
#: apt-inst/filelist.cc:481
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s"
+msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
#: apt-inst/filelist.cc:510
#, c-format
@@ -1458,7 +1451,7 @@ msgid "Duplicate conf file %s/%s"
msgstr "Arquivo de configuração duplicado %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
msgstr "Falha ao escrever ficheiro %s"
@@ -1494,7 +1487,7 @@ msgstr "O caminho de desvio é muito longo"
#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr "O directório %s está sendo substituído por um não-diretório"
+msgstr "O directório %s está sendo substituído por um não-directório"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
@@ -1512,7 +1505,7 @@ msgstr "Sobreescrita de pacote não coincide com nenhuma versão para %s"
#: apt-inst/extract.cc:434
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s"
+msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
@@ -1678,9 +1671,8 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Arquivo não encontrado"
+msgstr "Disco não encontrado"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
@@ -1869,7 +1861,7 @@ msgstr "Não posso iniciar a ligação para %s:%s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Não foi possível ligarar em %s:%s (%s), a conexão expirou"
+msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
#: methods/connect.cc:106
#, c-format
@@ -1905,41 +1897,43 @@ msgstr "Impossível ligar a %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
#: methods/gpgv.cc:191
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
+"digital da chave?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Pelo menos uma assinatura inválida foi encontrada."
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "Não foi possível obter lock %s"
+msgstr "Impossível de executar "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " para verificar assinatura (gnupg instalado?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Erro desconhecido ao executar gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "Os seguintes pacotes extra serão instalados:"
+msgstr "As seguintes assinaturas estavam inválidas:\n"
#: methods/gpgv.cc:244
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"As seguintes assinaturas não puderam ser verificadas porque a chave pública "
+"não está disponível:\n"
#: methods/gzip.cc:57
#, c-format
@@ -2364,7 +2358,7 @@ msgid "Malformed line %u in source list %s (type)"
msgstr "Linha malformada %u na lista de fontes %s (tipo)"
#: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
@@ -2418,12 +2412,12 @@ msgstr "Falta directório de listas %spartial."
#: apt-pkg/acquire.cc:66
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr "Falta o diretório de repositório %spartial."
+msgstr "Falta o directório de repositório %spartial."
#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "A efectuar download de ficheiro %li de %li (%s restantes)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2436,12 +2430,10 @@ msgid "Method %s did not start correctly"
msgstr "Método %s não iniciou corretamente"
#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-"Troca de mídia: Por favor insira o disco chamado\n"
-" '%s'\n"
-"na drive '%s' e pressione enter\n"
+"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
#: apt-pkg/init.cc:120
#, c-format
@@ -2465,7 +2457,7 @@ msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-"As listas de pacotes ou o ficheiro de status não pôde ser analizado ou "
+"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou "
"aberto."
#: apt-pkg/cachefile.cc:77
@@ -2580,7 +2572,7 @@ msgstr "MD5Sum incorreto"
#: apt-pkg/acquire-item.cc:645
msgid "There are no public key available for the following key IDs:\n"
-msgstr ""
+msgstr "Não existe qualquer chave pública disponível para as seguintes IDs de chave:\n"
#: apt-pkg/acquire-item.cc:758
#, c-format
@@ -2589,7 +2581,7 @@ msgid ""
"to manually fix this package. (due to missing arch)"
msgstr ""
"Não foi possível localizar um arquivo para o pacote %s. Isto pode significar "
-"que você precisa consertar manualmente este pacote. (devido a arquitetura "
+"que você precisa consertar manualmente este pacote. (devido a arquitectura "
"não especificada)."
#: apt-pkg/acquire-item.cc:817
@@ -2611,7 +2603,7 @@ msgstr ""
#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
-msgstr "Tamanho incorreto"
+msgstr "Tamanho incorrecto"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2715,54 +2707,54 @@ msgstr ""
"coincidentes\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Abrindo %s"
+msgstr "A preparar %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Abrindo %s"
+msgstr "A desempacotar %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Abrindo ficheiro de configuração %s"
+msgstr "A preparar para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Ligando a %s"
+msgstr "A configurar %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instalado: "
+msgstr "%s instalado"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "A preparar para remoção de %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Abrindo %s"
+msgstr "A remover %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Recomenda"
+msgstr "%s removido"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "A preparar para remover com a configuração %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Removido com a configuração %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
diff --git a/po/ro.po b/po/ro.po
index 10bf9b0f3..12b432d9c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,19 +1,19 @@
# translation of apt_ro.po to Romanian
# This file is put in the public domain.
-# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005.
#
+# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: apt_po_ro\n"
+"Project-Id-Version: apt_nou\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-01-20 14:01+0100\n"
-"PO-Revision-Date: 2005-08-25 17:43+0300\n"
+"PO-Revision-Date: 2006-02-27 11:59+0200\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: cmdline/apt-cache.cc:135
@@ -230,19 +230,15 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Vă rog furnizaţi un nume pentru acest disc, cum ar fi 'Debian 2.1r1 Disk 1'"
#: cmdline/apt-cdrom.cc:93
-#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Schimbare de mediu: Vă rog introduceţi discul numit\n"
-" '%s'\n"
-"în unitatea '%s' şi apăsaţi Enter\n"
+msgstr "Vă rog introduceţi un disc în unitate şi apăsaţi Enter"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Repetaţi această procedură pentru restul CD-urilor."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -713,12 +709,11 @@ msgid "%s (due to %s) "
msgstr "%s (datorită %s) "
#: cmdline/apt-get.cc:546
-#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n"
+"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse.\n"
"Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!"
#: cmdline/apt-get.cc:577
@@ -780,7 +775,7 @@ msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!"
#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Avertisment de autentificare înlocuit.\n"
#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
@@ -796,16 +791,15 @@ msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes"
#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată."
#: cmdline/apt-get.cc:775
-#, fuzzy
msgid "Internal error, Ordering didn't finish"
-msgstr "Eroare internă în timpul adăugării unei diversiuni"
+msgstr "Eroare internă, Ordering nu s-a terminat"
#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
@@ -818,7 +812,7 @@ msgstr "Lista surselor nu poate fi citită."
#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la apt@packages.debian.org"
#: cmdline/apt-get.cc:821
#, c-format
@@ -841,9 +835,9 @@ msgid "After unpacking %sB disk space will be freed.\n"
msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n"
#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Nu aveţi suficient spaţiu în %s"
+msgstr "N-am putut determina spaţiul disponibil în %s"
#: cmdline/apt-get.cc:849
#, c-format
@@ -852,21 +846,20 @@ msgstr "Nu aveţi suficient spaţiu în %s."
#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă."
+msgstr "A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă."
#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Da, fă cum îţi spun!"
#: cmdline/apt-get.cc:868
-#, fuzzy, c-format
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Sunteţi pe cale de a face ceva cu potenţial distructiv\n"
+"Sunteţi pe cale de a face ceva cu potenţial distructiv.\n"
"Pentru a continua tastaţi fraza '%s'\n"
" ?] "
@@ -1082,9 +1075,8 @@ msgid "Done"
msgstr "Terminat"
#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
-#, fuzzy
msgid "Internal error, problem resolver broke stuff"
-msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
+msgstr "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
@@ -1096,9 +1088,9 @@ msgid "Unable to find a source package for %s"
msgstr "Nu pot găsi o sursă pachet pentru %s"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
+#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
+msgstr "Sar peste fişierul deja descărcat '%s'\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1137,7 +1129,7 @@ msgstr "Comanda de despachetare '%s' eşuată.\n"
#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n"
#: cmdline/apt-get.cc:2086
#, c-format
@@ -1370,17 +1362,14 @@ msgstr "S-au produs unele erori în timpul despachetării. Voi configura"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr ""
-"pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate"
+msgstr "pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-"sau erori cauzate de dependenţe lipsă. Aceasta este normal, doar erorile"
+msgstr "sau erori cauzate de dependenţe lipsă. Aceasta este normal, doar erorile"
#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+msgid "above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"de deasupra acestui mesaj sunt importante. Vă rog corectaţi-le şi porniţi "
"din nou [I]nstalarea"
@@ -1462,9 +1451,9 @@ msgid "Duplicate conf file %s/%s"
msgstr "Fişier de configurare duplicat %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Failed to write file %s"
-msgstr "Eşuare în a scrie fişierul %s"
+msgstr "Eşuare în scrierea fişierului %s"
#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
@@ -1612,7 +1601,6 @@ msgid "Internal error adding a diversion"
msgstr "Eroare internă în timpul adăugării unei diversiuni"
#: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
msgid "The pkg cache must be initialized first"
msgstr "Cache-ul pachetului trebuie întâi iniţializat"
@@ -1685,9 +1673,8 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Fişier negăsit"
+msgstr "Disc negăsit."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
@@ -1912,41 +1899,38 @@ msgstr "Nu pot conecta la %s %s"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Listă de argumente din Acquire::gpgv::Options prea lungă. Ies."
#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "Eroare internă: Semnătură corespunzătoare, dar n-am putut determina cheia amprentei digitale?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Cel puţin o semnătură invalidă a fost întâlnită."
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "Nu pot determina blocajul %s"
+msgstr "Nu s-a putut executa "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " verificarea semnăturii (este instalat gnupg?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Eroare necunoscută în timp ce se execută gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "Următoarele extra pachete vor fi instalate:"
+msgstr "Următoarele semnături au fost invalide:\n"
#: methods/gpgv.cc:244
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr ""
+msgstr "Următoarele semnături n-au putut fi verificate datorită cheii publice care este indisponibilă:\n"
#: methods/gzip.cc:57
#, c-format
@@ -2013,8 +1997,7 @@ msgstr "Eroare la scrierea în fişierul"
#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
-msgstr ""
-"Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
+msgstr "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
#: methods/http.cc:876
msgid "Error reading from server"
@@ -2079,8 +2062,7 @@ msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare"
#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior"
+msgstr "Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior"
#: apt-pkg/contrib/configuration.cc:691
#, c-format
@@ -2136,8 +2118,7 @@ msgstr "Opţiunea %s necesită un argument"
#: 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 ""
-"Opţiunea %s: Specificaţia configurării articolului trebuie să aibă o =<val>."
+msgstr "Opţiunea %s: Specificaţia configurării articolului trebuie să aibă o =<val>."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
@@ -2372,7 +2353,7 @@ msgid "Malformed line %u in source list %s (type)"
msgstr "Linie greşită %u în lista sursă %s (tip)"
#: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
@@ -2400,10 +2381,8 @@ msgstr "Tipul de fişier index '%s' nu este suportat"
#: apt-pkg/algorithms.cc:241
#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
#: apt-pkg/algorithms.cc:1059
msgid ""
@@ -2430,7 +2409,7 @@ msgstr "Directorul de arhive %spartial lipseşte."
#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Se descarcă fişierul %li din %li (%s rămas)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2443,12 +2422,9 @@ msgid "Method %s did not start correctly"
msgstr "Metoda %s nu s-a lansat corect"
#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Schimbare de mediu: Vă rog introduceţi discul numit\n"
-" '%s'\n"
-"în unitatea '%s' şi apăsaţi Enter\n"
+msgstr "Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter."
#: apt-pkg/init.cc:120
#, c-format
@@ -2476,8 +2452,7 @@ msgstr ""
#: apt-pkg/cachefile.cc:77
msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme."
+msgstr "Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme."
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
@@ -2497,39 +2472,39 @@ msgid "Cache has an incompatible versioning system"
msgstr "Cache are un versioning system incompatibil"
#: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Eroare în timpul procesării %s (Pachet Nou)"
+msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Eroare în timpul procesării %s (UsePackage1)"
+msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Eroare în timpul procesării %s (UsePackage2)"
+msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Eroare în timpul procesării %s (NewFileVer1)"
+msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Eroare în timpul procesării %s (NewVersion1)"
+msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Eroare în timpul procesării %s (UsePackage3)"
+msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Eroare în timpul procesării %s (NewVersion2)"
+msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2539,29 +2514,26 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
+msgstr "Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
+msgstr "Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
#: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Eroare în timpul procesării %s (FindPkg)"
+msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Eroare în timpul procesării %s (CollectFileProvides)"
+msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-"Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere"
+msgstr "Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere"
#: apt-pkg/pkgcachegen.cc:574
#, c-format
@@ -2587,7 +2559,7 @@ msgstr "Nepotrivire MD5Sum"
#: apt-pkg/acquire-item.cc:645
msgid "There are no public key available for the following key IDs:\n"
-msgstr ""
+msgstr "Nu există nici o cheie publică disponibilă pentru următoarele identificatoare de chei:\n"
#: apt-pkg/acquire-item.cc:758
#, c-format
@@ -2609,8 +2581,7 @@ msgstr ""
#: apt-pkg/acquire-item.cc:853
#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
@@ -2716,59 +2687,59 @@ msgstr "S-au scris %i înregistrări cu %i fişiere nepotrivite\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n"
+msgstr "S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Deschidere %s"
+msgstr "Se pregăteşte %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Deschidere %s"
+msgstr "Se despachetează %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Deschidere fişier de configurare %s"
+msgstr "Se pregăteşte configurarea %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Conectare la %s"
+msgstr "Se configurează %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instalat: "
+msgstr "Instalat %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Se pregăteşte ştergerea lui %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Deschidere %s"
+msgstr "Se şterge %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Recomandă"
+msgstr "Şters %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "Se pregăteşte pentru ştergere inclusiv configurarea %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Şters inclusiv configurarea %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Conexiune închisă prematur"
+
diff --git a/po/tl.po b/po/tl.po
index dc7c0d0ae..79dfe5432 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-20 14:01+0100\n"
-"PO-Revision-Date: 2005-12-22 01:10+0800\n"
+"POT-Creation-Date: 2006-01-20 14:06+0100\n"
+"PO-Revision-Date: 2006-03-16 15:53+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
"MIME-Version: 1.0\n"
@@ -442,7 +442,7 @@ msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old"
#: ftparchive/cachedb.cc:63
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "Luma ang DB, sinusubukang maupgrade %s"
+msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
#: ftparchive/cachedb.cc:73
#, c-format
@@ -452,7 +452,7 @@ msgstr "Hindi mabuksan ang talaksang DB %s: %s"
#: ftparchive/cachedb.cc:114
#, c-format
msgid "File date has changed %s"
-msgstr "Nagbago ang petsa ng talaksan %s"
+msgstr "Nagbago ang petsa ng talaksang %s"
#: ftparchive/cachedb.cc:155
msgid "Archive has no control record"
@@ -541,7 +541,7 @@ msgstr " %s ay walang override entry\n"
#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
-msgstr " Maintainer ng %s ay %s hindi %s\n"
+msgstr " Tagapangalaga ng %s ay %s hindi %s\n"
#: ftparchive/contents.cc:317
#, c-format
@@ -721,7 +721,7 @@ msgstr ""
#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nai-upgrade, %lu bagong luklok, "
+msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
#: cmdline/apt-get.cc:581
#, c-format
@@ -835,12 +835,13 @@ msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Matapos magbuklat ay %sB na karagdagang puwang sa disk ay magagamit.\n"
+msgstr ""
+"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Matapos magbuklat %sB na puwang sa disk ay mapapalaya.\n"
+msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
@@ -921,12 +922,12 @@ msgstr "Paunawa, pinili ang %s imbes na %s\n"
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-"Linaktawan ang %s, ito'y naka-instol na at hindi nakatakda ang upgrade.\n"
+"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "Hindi naka-instol ang paketeng %s, kaya't hindi ito tinanggal\n"
+msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
#: cmdline/apt-get.cc:1069
#, c-format
@@ -935,11 +936,11 @@ msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n"
#: cmdline/apt-get.cc:1081
msgid " [Installed]"
-msgstr " [Naka-instol]"
+msgstr " [Nakaluklok]"
#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
-msgstr "Dapat ninyong piliin ang isa na instolahin."
+msgstr "Dapat kayong mamili ng isa na iluluklok."
#: cmdline/apt-get.cc:1091
#, c-format
@@ -949,7 +950,7 @@ msgid ""
"is only available from another source\n"
msgstr ""
"Hindi magamit ang %s, ngunit ito'y tinutukoy ng ibang pakete.\n"
-"Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n"
+"Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
"sa ibang pinagmulan.\n"
#: cmdline/apt-get.cc:1110
@@ -964,7 +965,7 @@ msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Ang pag-instol muli ng %s ay hindi maaari, hindi ito makuha.\n"
+msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n"
#: cmdline/apt-get.cc:1141
#, c-format
@@ -1047,7 +1048,7 @@ msgid ""
"that package should be filed."
msgstr ""
"Dahil ang hiniling niyo ay mag-isang operasyon, malamang ay ang pakete ay\n"
-"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n"
+"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n"
"pakete na ito."
#: cmdline/apt-get.cc:1583
@@ -1061,7 +1062,7 @@ msgstr "Sirang mga pakete"
#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
-msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:"
+msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
@@ -1073,7 +1074,7 @@ msgstr "Mga paketeng rekomendado:"
#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
-msgstr "Kinakalkula ang upgrade... "
+msgstr "Sinusuri ang pag-upgrade... "
#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
@@ -1097,9 +1098,9 @@ msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
+#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
+msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1310,7 +1311,7 @@ msgstr "Nakakuha ng %sB ng %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
msgid " [Working]"
-msgstr " [May Ginagawa]"
+msgstr " [May ginagawa]"
#: cmdline/acqprogress.cc:271
#, c-format
@@ -1367,7 +1368,7 @@ msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr "mga paketeng na-instol. Maaaring dumulot ito ng mga error na doble"
+msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1379,7 +1380,7 @@ msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"sa taas nitong kalatas ang importante. Paki-ayusin ang mga ito at patakbuhin "
-"muli ang [I]nstol."
+"muli ang [I]luklok/Instol."
#: dselect/update:30
msgid "Merging available information"
@@ -1840,7 +1841,7 @@ msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'"
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
-msgstr "Query"
+msgstr "Tanong"
#: methods/ftp.cc:1106
msgid "Unable to invoke "
@@ -1957,16 +1958,16 @@ msgstr "Error sa pagbasa mula sa prosesong %s"
#: methods/http.cc:376
msgid "Waiting for headers"
-msgstr "Naghihintay ng mga header"
+msgstr "Naghihintay ng panimula"
#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "Nakatanggap ng isang linyang header mula %u na mga karakter"
+msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
#: methods/http.cc:530
msgid "Bad header line"
-msgstr "Maling linyang header"
+msgstr "Maling linyang panimula"
#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
@@ -2018,7 +2019,7 @@ msgstr "Error sa pagbasa mula sa server"
#: methods/http.cc:1107
msgid "Bad header data"
-msgstr "Maling datos sa header"
+msgstr "Maling datos sa panimula"
#: methods/http.cc:1124
msgid "Connection failed"
@@ -2111,40 +2112,40 @@ msgstr "%c%s... Tapos"
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "Option sa command line '%c' [mula %s] ay di kilala."
+msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala."
#: 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 "Option sa command line %s ay di naintindihan."
+msgstr "Opsyon sa command line %s ay di naintindihan."
#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "Option sa command line %s ay hindi boolean"
+msgstr "Opsyon sa command line %s ay hindi boolean"
#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
-msgstr "Option %s ay nangangailangan ng argumento"
+msgstr "Opsyon %s ay nangangailangan ng argumento"
#: 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 ""
-"Option %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
+"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
"=<halaga>."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Option %s ay nangangailangan ng argumentong integer, hindi '%s'"
+msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'"
#: apt-pkg/contrib/cmndline.cc:268
#, c-format
msgid "Option '%s' is too long"
-msgstr "Option '%s' ay labis ang haba"
+msgstr "Opsyon '%s' ay labis ang haba"
#: apt-pkg/contrib/cmndline.cc:301
#, c-format
@@ -2279,7 +2280,7 @@ msgstr "Rekomendado"
#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
-msgstr "Conflict"
+msgstr "Tunggali"
#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
@@ -2584,7 +2585,7 @@ msgstr "Di tugmang MD5Sum"
#: apt-pkg/acquire-item.cc:645
msgid "There are no public key available for the following key IDs:\n"
-msgstr ""
+msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n"
#: apt-pkg/acquire-item.cc:758
#, c-format
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 03:34:48 +0000