summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2006-03-01 12:36:32 +0000
committerMichael Vogt <mvo@debian.org>2006-03-01 12:36:32 +0000
commit131a2dc0cb36c29d002c2a61f96411e5d84f4adf (patch)
tree82cf88aec560d0810a26fc101be1c593e1a80f69
parent5c4d7f0764f99ebe6e65933b1bc08671dbab98e9 (diff)
parent9005c2b7f600d23c5ebf7c7cab295d036627bd6c (diff)
* merged with debian-sid branch
Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-160 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-161 Galician translation completed * bubulle@debian.org--2005/apt--main--0--patch-162 Spanish translation update * bubulle@debian.org--2005/apt--main--0--patch-163 Two strings corrected in the British translation * bubulle@debian.org--2005/apt--main--0--patch-164 Danish translation update * bubulle@debian.org--2005/apt--main--0--patch-165 Completed Greek translation * bubulle@debian.org--2005/apt--main--0--patch-166 Fix some permissions * bubulle@debian.org--2005/apt--main--0--patch-167 Resync with Michael * bubulle@debian.org--2005/apt--main--0--patch-168 Vietnamese translation completed * bubulle@debian.org--2005/apt--main--0--patch-169 Update PO files and POT file...again * bubulle@debian.org--2005/apt--main--0--patch-170 Compelted French translation * bubulle@debian.org--2005/apt--main--0--patch-171 Activate Welsh translation * bubulle@debian.org--2005/apt--main--0--patch-172 Completed to 512 strings * bubulle@debian.org--2005/apt--main--0--patch-173 Russian translation completed * bubulle@debian.org--2005/apt--main--0--patch-174 Swedish translation completed * bubulle@debian.org--2005/apt--main--0--patch-175 Merge from Philippe Batailler French manpages tree/Vietnamese translation update * bubulle@debian.org--2005/apt--main--0--patch-176 Galician translation update * bubulle@debian.org--2005/apt--main--0--patch-177 Slovak translation update * bubulle@debian.org--2005/apt--main--0--patch-178 Polish translation update * bubulle@debian.org--2005/apt--main--0--patch-179 Correct permissions * bubulle@debian.org--2005/apt--main--0--patch-180 Japanese translation update * bubulle@debian.org--2005/apt--main--0--patch-181 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-182 Catalan translation completed * bubulle@debian.org--2005/apt--main--0--patch-183 Brazilian Portuguese translation update * bubulle@debian.org--2005/apt--main--0--patch-184 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-185 Japanese manpages translation update * bubulle@debian.org--2005/apt--main--0--patch-186 Simplified Chinese translation update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120 * added debian-archive-keyring to recommends * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-121 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-122 * fix apt-key to ask for the correct package * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123 * fix typo in apt-cache.8 manpage * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124 * fixed another typo in doc/apt-secure.8.xml * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125 * merged the debian-sid changes back * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126 * fixed the changelog yet again * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-127 * merged with apt--mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-128 * don't explod if a Provides has DepCompareOp * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-129 * fix regression about not working --print-uris in "install" * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-130 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-131 * create sources.list.d as well * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-132 * make apt-cache madion wotk without deb-src lines * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-133 * only clean out the list dir if the update was successful * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-134 * only remove the sigfile if pkgAcqMetaSig::Failed() didn't fail for a network error * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-135 tyop * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-136 * merged with bubulle * mvo@debian.org--2005/apt--debian-sid--0--patch-18 * merged with apt--mvo * mvo@debian.org--2005/apt--debian-sid--0--patch-19 * synced with mainline * mvo@debian.org--2005/apt--debian-sid--0--patch-20 * merged with mainline, finalized changelog * philippe.batailler@free.fr--2005/apt--main--0--patch-9 manpages
-rw-r--r--apt-pkg/acquire-item.cc19
-rw-r--r--apt-pkg/deb/deblistparser.cc11
-rw-r--r--cmdline/apt-cache.cc5
-rw-r--r--cmdline/apt-get.cc11
-rwxr-xr-xcmdline/apt-key2
-rw-r--r--configure.in2
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/changelog53
-rw-r--r--debian/control1
-rw-r--r--doc/apt-cache.8.xml2
-rw-r--r--doc/apt-secure.8.xml2
-rw-r--r--doc/fr/apt.ent.fr63
-rw-r--r--doc/ja/apt-cache.ja.8.sgml638
-rw-r--r--doc/ja/apt-cache.ja.8.xml701
-rw-r--r--doc/ja/apt-cdrom.ja.8.sgml230
-rw-r--r--doc/ja/apt-cdrom.ja.8.xml255
-rw-r--r--doc/ja/apt-config.ja.8.xml165
-rw-r--r--doc/ja/apt-extracttemplates.ja.1.xml121
-rw-r--r--doc/ja/apt-ftparchive.ja.1.xml1019
-rw-r--r--doc/ja/apt-get.ja.8.sgml857
-rw-r--r--doc/ja/apt-get.ja.8.xml900
-rw-r--r--doc/ja/apt-key.ja.8.xml176
-rw-r--r--doc/ja/apt-secure.ja.8.xml374
-rw-r--r--doc/ja/apt-sortpkgs.ja.1.xml110
-rw-r--r--doc/ja/apt.conf.ja.5.sgml785
-rw-r--r--doc/ja/apt.conf.ja.5.xml809
-rw-r--r--doc/ja/apt.ent.ja411
-rw-r--r--doc/ja/apt_preferences.ja.5.xml940
-rw-r--r--doc/ja/makefile56
-rw-r--r--doc/ja/manpage.links0
-rw-r--r--doc/ja/manpage.refs4
-rw-r--r--doc/ja/sources.list.ja.5.xml427
-rw-r--r--doc/ja/style.ja.xsl9
-rw-r--r--methods/connect.cc2
-rw-r--r--po/ChangeLog99
-rw-r--r--po/LINGUAS2
-rw-r--r--po/apt-all.pot562
-rw-r--r--po/bs.po564
-rw-r--r--po/ca.po658
-rw-r--r--po/cs.po581
-rw-r--r--po/da.po632
-rw-r--r--po/de.po590
-rw-r--r--po/el.po73
-rw-r--r--po/en_GB.po70
-rw-r--r--po/es.po166
-rw-r--r--po/eu.po128
-rw-r--r--po/fi.po62
-rw-r--r--po/fr.po144
-rw-r--r--po/gl.po70
-rw-r--r--po/hu.po62
-rw-r--r--po/it.po360
-rw-r--r--po/ja.po1426
-rw-r--r--po/ko.po62
-rw-r--r--po/nb.po62
-rw-r--r--po/nl.po62
-rw-r--r--po/nn.po62
-rw-r--r--po/pl.po238
-rw-r--r--po/pt.po62
-rw-r--r--po/pt_BR.po192
-rw-r--r--po/ro.po62
-rw-r--r--po/ru.po140
-rw-r--r--po/sk.po64
-rw-r--r--po/sl.po62
-rw-r--r--po/sv.po470
-rw-r--r--po/tl.po62
-rw-r--r--po/vi.po1304
-rw-r--r--po/zh_CN.po72
-rw-r--r--po/zh_TW.po62
68 files changed, 10944 insertions, 7504 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index c6a49653b..52c516090 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -772,12 +772,6 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
// File was already in place. It needs to be re-verified
// because Release might have changed, so Move it into partial
Rename(Final,DestFile);
- // unlink the file and do not try to use I-M-S and Last-Modified
- // if the users proxy is broken
- if(_config->FindB("Acquire::BrokenProxy", false) == true) {
- std::cerr << "forcing re-get of the signature file as requested" << std::endl;
- unlink(DestFile.c_str());
- }
}
QueueURI(Desc);
@@ -827,18 +821,19 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5,
/*}}}*/
void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
- // Delete any existing sigfile, so that this source isn't
- // mistakenly trusted
- string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
- unlink(Final.c_str());
- // if we get a timeout if fail
+ // if we get a network error we fail gracefully
if(LookupTag(Message,"FailReason") == "Timeout" ||
- LookupTag(Message,"FailReason") == "TmpResolveFailure") {
+ LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
+ LookupTag(Message,"FailReason") == "ConnectionRefused") {
Item::Failed(Message,Cnf);
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
new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc,
"", IndexTargets, MetaIndexParser);
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 441bb826f..c2b26b5eb 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -547,11 +547,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver)
Start = ParseDepends(Start,Stop,Package,Version,Op);
if (Start == 0)
return _error->Error("Problem parsing Provides line");
- if (Op != pkgCache::Dep::NoOp)
- return _error->Error("Malformed provides line");
-
- if (NewProvides(Ver,Package,Version) == false)
- return false;
+ if (Op != pkgCache::Dep::NoOp) {
+ _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());
+ } else {
+ if (NewProvides(Ver,Package,Version) == false)
+ return false;
+ }
if (Start == Stop)
break;
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index cb1aeb514..74fa71cba 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1630,10 +1630,11 @@ bool Madison(CommandLine &CmdL)
pkgCache &Cache = *GCache;
- // Create the text record parsers
+ // Create the src text record parsers and ignore errors about missing
+ // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords
pkgSrcRecords SrcRecs(*SrcList);
if (_error->PendingError() == true)
- return false;
+ _error->Discard();
for (const char **I = CmdL.FileList + 1; *I != 0; I++)
{
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index abeb57c6f..d4a6bee32 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1368,7 +1368,7 @@ bool DoUpdate(CommandLine &CmdL)
}
// Clean out any old list files
- if (_config->FindB("APT::Get::List-Cleanup",true) == true)
+ if (!Failed && _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)
@@ -1411,15 +1411,6 @@ 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/cmdline/apt-key b/cmdline/apt-key
index 0685e36f7..7460a24be 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -16,7 +16,7 @@ REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-keyring package installed?"
+ echo >&2 "Is the debian-archive-keyring package installed?"
exit 1
fi
diff --git a/configure.in b/configure.in
index a1913e0fd..41609c39d 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.2")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/apt.dirs b/debian/apt.dirs
index d39bfd1f7..e1cb738fa 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -2,6 +2,7 @@ usr/bin
usr/lib/apt/methods
usr/lib/dpkg/methods/apt
etc/apt
+etc/apt/sources.list.d
var/cache/apt/archives/partial
var/lib/apt/lists/partial
var/lib/apt/periodic
diff --git a/debian/changelog b/debian/changelog
index b54cb635f..d2e780235 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.43.2exp1) experimental; urgency=low
+apt (0.6.43.3exp1) experimental; urgency=low
* added support for package index diffs
* added support for i18n of the package descriptions
@@ -6,23 +6,62 @@ apt (0.6.43.2exp1) experimental; urgency=low
* build from mvo@debian.org--2005/apt--debian-experimental--0
(from http://people.debian.org/~mvo/arch)
- -- Michael Vogt <mvo@debian.org> Thu, 12 Jan 2006 23:40:32 +0100
+ -- Michael Vogt <mvo@debian.org> Wed, 1 Mar 2006 13:34:15 +0100
+
+apt (0.6.43.3) unstable; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
+ * 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
+ * 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)
+ * 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)
+ * cmdline/apt-get.cc:
+ - don't lock the lists directory in DoInstall, breaks --print-uri
+ (thanks to James Troup for reporting it)
+ * debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
+
+ -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
apt (0.6.43.2) unstable; 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
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
+ - 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
+ 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)
+ - el.po: Completed to 511 strings Closes: #344642
+ - da.po: Completed to 511 strings Closes: #348574
+ - es.po: Updated to 510t1f Closes: #348158
+ - gl.po: Completed to 511 strings Closes: #347729
+ - it.po: Yet another update Closes: #347435
+ * added debian-archive-keyring to the Recommends (closes: #347970)
+ * fixed message in apt-key to install debian-archive-keyring
+ * typos fixed in apt-cache.8 (closes: #348348, #347349)
* add patch to fix http download corruption problem (thanks to
Petr Vandrovec, closes: #280844, #290694)
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+ -- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
apt (0.6.43.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5c76a90eb..3b8883f88 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +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
Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
Section: admin
Description: Advanced front-end for dpkg
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 0e1d2f8d9..789c3d228 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -191,7 +191,7 @@ Reverse Provides:
<varlistentry><term>show <replaceable>pkg(s)</replaceable></term>
<listitem><para><literal>show</literal> performs a function similar to
- <command>dpkg --print-avail</command>i; it displays the package records for the
+ <command>dpkg --print-avail</command>; it displays the package records for the
named packages.</para></listitem>
</varlistentry>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index e22446030..fa13ddc0f 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -120,7 +120,7 @@
<listitem><para><literal>Mirror network compromise</literal>.
Without signature checking, a malicious agent can compromise a
- mirror host and modify the files in it to propage malicious
+ mirror host and modify the files in it to propagate malicious
software to all users downloading packages from that
host.</para></listitem>
</itemizedlist>
diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index 94398bb44..d705b9e3e 100644
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -11,36 +11,38 @@
<!ENTITY apt-conf "<citerefentry>
<refentrytitle><filename>apt.conf</filename></refentrytitle>
<manvolnum>5</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY apt-get "<citerefentry>
<refentrytitle><command>apt-get</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY apt-config "<citerefentry>
<refentrytitle><command>apt-config</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>">
+ </citerefentry>"
+>
<!ENTITY apt-cdrom "<citerefentry>
<refentrytitle><command>apt-cdrom</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY apt-cache "<citerefentry>
<refentrytitle><command>apt-cache</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY apt-preferences "<citerefentry>
<refentrytitle><command>apt_preferences</command></refentrytitle>
<manvolnum>5</manvolnum>
- </citerefentry>">
+ </citerefentry>"
+>
<!ENTITY apt-key "<citerefentry>
<refentrytitle><command>apt-key</command></refentrytitle>
@@ -69,43 +71,44 @@
<!ENTITY reportbug "<citerefentry>
<refentrytitle><command>reportbug</command></refentrytitle>
<manvolnum>1</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dpkg "<citerefentry>
<refentrytitle><command>dpkg</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dpkg-buildpackage "<citerefentry>
<refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
<manvolnum>1</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY gzip "<citerefentry>
<refentrytitle><command>gzip</command></refentrytitle>
<manvolnum>1</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dpkg-scanpackages "<citerefentry>
<refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dpkg-scansources "<citerefentry>
<refentrytitle><command>dpkg-scansources</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>
-">
+ </citerefentry>"
+>
<!ENTITY dselect "<citerefentry>
<refentrytitle><command>dselect</command></refentrytitle>
<manvolnum>8</manvolnum>
- </citerefentry>">
+ </citerefentry>"
+>
<!ENTITY aptitude "<citerefentry>
<refentrytitle><command>aptitude</command></refentrytitle>
@@ -192,8 +195,8 @@ Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues
Si vous voulez signaler un bogue, consultez le texte
<filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utilisez la
commande &reportbug;.</para>
- </refsect1>
- ">
+ </refsect1>"
+>
<!-- Boiler plate Author section -->
<!ENTITY manauthor "
@@ -201,17 +204,17 @@ commande &reportbug;.</para>
<para>
APT a t crit par l'quipe APT <email>apt@packages.debian.org</email>.
</para>
- </refsect1>
-">
+ </refsect1>"
+>
<!-- Section traduction -->
<!ENTITY deux-traducteurs "
<refsect1><title>Traduction</title>
<para>
Jrme Marant. 2000&nbsp;; mise jour : Philippe Batailler. 2005.
-</para>
-</refsect1>
-">
+<email>debian-l10n-french@lists.debian.org</email>.</para>
+</refsect1>"
+>
<!ENTITY traducteur "
<refsect1><title>Traduction</title>
diff --git a/doc/ja/apt-cache.ja.8.sgml b/doc/ja/apt-cache.ja.8.sgml
deleted file mode 100644
index 020137021..000000000
--- a/doc/ja/apt-cache.ja.8.sgml
+++ /dev/null
@@ -1,638 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.10 -->
-<!-- Bug#175611 is fixed in translation -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
-
- <refmeta>
- <refentrytitle>apt-cache</>
- <manvolnum>8</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
- <refname>apt-cache</>
-<!-- <refpurpose>APT package handling utility - - cache manipulator</> -->
- <refpurpose>APT ѥå桼ƥƥ -- å</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>apt-cache</>
- <arg><option>-hvsn</></arg>
- <arg><option>-o=<replaceable/config string/</></arg>
- <arg><option>-c=<replaceable/file/</></arg>
- <group choice=req>
- <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg>
- <arg>gencaches</>
- <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>stats</>
- <arg>dump</>
- <arg>dumpavail</>
- <arg>unmet</>
- <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg>
- <arg>show <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-<!--
-Bug#175611
- <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> -->
- <arg>depends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg>
- <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
- </group>
- </cmdsynopsis>
- </refsynopsisdiv>
-
-<!-- <RefSect1><Title>Description</>-->
- <RefSect1><Title></>
- <para>
-<!--
- <command/apt-cache/ performs a variety of operations on APT's package
- cache. <command/apt-cache/ does not manipulate the state of the system
- but does provide operations to search and generate interesting output
- from the package metadata.
--->
- <command/apt-cache/ APT ΥѥååФƤԤޤ
- <command/apt-cache/ ϡƥ֤ϹԤޤ󤬡
- ѥåΥ᥿ǡ긡ꡢ̣ϤȤä
- 󶡤ޤ
- <para>
-<!--
- Unless the <option/-h/, or <option/-/-help/ option is given one of the
- commands below must be present.
--->
- <option/-h/ <option/--help/ ʲ˵󤲤륳ޥɤɬפǤ
- <VariableList>
- <VarListEntry><Term>add</Term>
- <ListItem><Para>
-<!--
- <literal/add/ adds the named package index files to the package cache.
- This is for debugging only.
--->
- <literal/add/ ϥѥååˡꤷѥåǥå
- եɲäޤǥХåѤǤ
- </VarListEntry>
-
- <VarListEntry><Term>gencaches</Term>
- <ListItem><Para>
-<!--
- <literal/gencaches/ performs the same opration as
- <command/apt-get check/. It builds the source and package caches from
- the sources in &sources-list; and from <filename>/var/lib/dpkg/status</>.
--->
- <literal/gencaches/ <command/apt-get check/ Ʊư󶡤ޤ
- &sources-list; μ <filename>/var/lib/dpkg/status</>
- 顢ȥѥåΥåۤޤ
- </VarListEntry>
-
- <VarListEntry><Term>showpkg</Term>
- <ListItem><Para>
-<!--
- <literal/showpkg/ displays information about the packages listed on the
- command line. Remaining arguments are package names. The available
- versions and reverse dependencies of each package listed are listed, as
- well as forward dependencies for each version. Forward (normal)
- dependencies are those packages upon which the package in question
- depends; reverse dependencies are those packages that depend upon the
- package in question. Thus, forward dependencies must be satisfied for a
- package, but reverse dependencies need not be.
- For instance, <command>apt-cache showpkg libreadline2</> would produce
- output similar to the following:
--->
- <literal/showpkg/ ϡޥɥ饤󤷤ѥåξ
- ɽޤĤΰϥѥå̾Ǥ
- 󤷤ѥåˤĤơƥСΰ¸طɽ褦
- ͭʥС¸ط󤷤ޤ
- ()¸طȤϡоݤΥѥå¸Ƥѥå򤵤ޤ
- ޤ¸طȤϡоݤΥѥå˰¸Ƥѥå򤵤ޤ
- äơѥåΰ¸طʤФʤޤ󤬡
- ¸طϤɬפϤޤ
- Ȥơʲ <command>apt-cache showpkg libreadline2</>
- ϤǤޤ
-
-<informalexample><programlisting>
-Package: libreadline2
-Versions: 2.1-12(/var/state/apt/lists/foo_Packages),
-Reverse Depends:
- libreadlineg2,libreadline2
- libreadline2-altdev,libreadline2
-Dependencies:
-2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))
-Provides:
-2.1-12 -
-Reverse Provides:
-</programlisting></informalexample>
-
- <para>
-<!-- Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and
- ncurses3.0 which must be installed for libreadline2 to work.
- In turn, libreadlineg2 and libreadline2-altdev depend on libreadline2. If
- libreadline2 is installed, libc5, ncurses3.0, and ldso must also be
- installed; libreadlineg2 and libreadline2-altdev do not have to be
- installed. For the specific meaning of the remainder of the output it
- is best to consult the apt source code.
--->
- Ĥޤꡢlibreadline2 version 2.1-12 libc5 ncurses3.0 ˰¸
- ơlibreadline2 ưˤϤ򥤥󥹥ȡ뤹ɬפ
- ȤȽޤ
- libreadlineg2 libreadline2-altdev libreadline2 ˰¸Ƥޤ
- libreadline2 򥤥󥹥ȡ뤹뤿ˤϡlibc5, ncurses3.0, ldso
- ٤ƥ󥹥ȡ뤷ʤФʤޤ󤬡libreadlineg2
- libreadline2-altdev ϥ󥹥ȡ뤹ɬפϤޤ
- ϤλĤʬΰ̣ˤĤƤϡapt ΥɤĴ٤ΤɤǤ礦
- </VarListEntry>
-
- <VarListEntry><Term>stats</Term>
- <ListItem><Para>
-<!--
- <literal/stats/ displays some statistics about the cache.
- No further arguments are expected. Statistics reported are:
--->
- <literal/stats/ ϥåˤĤƤ׾ɽޤ
- ʾ塢ɬפޤ󡣰ʲ׾ɽޤ
- <itemizedlist>
-<!--
-ʲ stats ΥƥˤĤƤϡɽ̾ (ʸ) Ȥ
-Ҥޤ(ɽܤΥʤ褦)
-ǽŪ˥å˽ɬפޤ(߷)
--->
- <listitem><para>
-<!--
- <literal/Total package names/ is the number of package names found
- in the cache.
--->
- <literal/Total package names (ѥå)/ ϡ
- å¸ߤѥåɽޤ
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Normal packages/ is the number of regular, ordinary package
- names; these are packages that bear a one-to-one correspondence between
- their names and the names used by other packages for them in
- dependencies. The majority of packages fall into this category.
--->
- <literal/Normal packages (̾ѥå)/ ϡ
- ̤Υѥåɽޤ
- ϡ¾Υѥåΰ¸طǻѤ줿̾Τǡ줬аб
- ѥåǤ
- ¿ΥѥåϤΥƥޤ
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Pure virtual packages/ is the number of packages that exist
- only as a virtual package name; that is, packages only "provide" the
- virtual package name, and no package actually uses the name. For
- instance, "mail-transport-agent" in the Debian GNU/Linux system is a
- pure virtual package; several packages provide "mail-transport-agent",
- but there is no package named "mail-transport-agent".
--->
- <literal/Pure virtual packages (㲾ۥѥå)/ ϡ
- ۥѥå̾ȤƤΤ¸ߤ
- ѥå (ۥѥå̾Τߤ󶡡פºݤˤϤʤ
- ѥå⤽̾Τʤ) οɽޤ
- 㤨СDebian GNU/Linux ƥǤ "mail-transport-agent"
- 㲾ۥѥåǤ"mail-transport-agent" 󶡤ѥå
- Ĥ⤢ޤ"mail-transport-agent" Ȥ̾ΤΥѥå
- ޤ
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Single virtual packages/ is the number of packages with only
- one package providing a particular virtual package. For example, in the
- Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but
- only one package, xless, provides "X11-text-viewer".
--->
- <literal/Single virtual packages (ñۥѥå)/ ϡ
- βۥѥå̾󶡤ѥå
- Ĥξοɽޤ
- 㤨СDebian GNU/Linux ƥǤϡ"X11-text-viewer"
- ۥѥåǤ"X11-text-viewer" 󶡤ѥåϡ
- xless ѥåΤߤȤȤǤ
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Mixed virtual packages/ is the number of packages that either
- provide a particular virtual package or have the virtual package name
- as the package name. For instance, in the Debian GNU/Linux system,
- debconf is both an actual package, and provided by the debconf-tiny
- package.
--->
- <literal/Mixed virtual packages (ʣۥѥå)/ ϡ
- βۥѥå̾󶡤ѥåʣ뤫
- ޤѥå̾Ʊۥѥå̾ĥѥåɽޤ
- 㤨СDebian GNU/Linux ƥǤϡdebconf ϼºݤΥѥå̾Ǥ
- ޤdebconf-tiny ˤä󶡤⤵Ƥޤ
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Missing/ is the number of package names that were referenced in
- a dependency but were not provided by any package. Missing packages may
- be in evidence if a full distribution is not accesssed, or if a package
- (real or virtual) has been dropped from the distribution. Usually they
- are referenced from Conflicts statements.
--->
- <literal/Missing ()/ ϡ¸طˤ¸ߤΤˡɤΥѥå
- ˤ󶡤Ƥʤѥå̾οɽޤ
- ѥåȤȤϡǥȥӥ塼˥
- Ƥʤ(¤ʤ) ѥåǥȥӥ塼󤫤
- ϤƤޤä⤷ʤȤɽޤ
- ̾Ϲʸ̷⤹뤳ȤǻȤޤ
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Total distinct/ versions is the number of package versions
- found in the cache; this value is therefore at least equal to the
- number of total package names. If more than one distribution (both
- "stable" and "unstable", for instance), is being accessed, this value
- can be considerably larger than the number of total package names.
--->
- <literal/Total distinct versions (̥С)/ ϥå
- ¸ߤѥåΥСοɽޤΤᡢͤ
- ǾǤѥåפȰפޤ
- Ȥ 2 ʾΥǥȥӥ塼
- ("stable" "unstable"ξʤ) Ѥ硢
- ͤϥѥåפ⤫ʤ礭ˤʤޤ
- </listitem>
-
- <listitem><para>
-<!--
- <literal/Total dependencies/ is the number of dependency relationships
- claimed by all of the packages in the cache.
--->
- <literal/Total dependencies (¸ط)/ ϥåΤ٤Ƥ
- ѥå׵ᤵ줿¸طοǤ
- </listitem>
- </itemizedlist>
- </VarListEntry>
-
- <VarListEntry><Term>showsrc</Term>
- <ListItem><Para>
-<!--
- <literal/showsrc/ displays all the source package records that match
- the given package names. All versions are shown, as well as all
- records that declare the name to be a Binary.
- named packages.
--->
- <literal/showsrc/ ϻꤷѥå̾Ȱפ륽ѥå
- ٤ɽޤꤷѥåˤĤơХʥˤʤȤ̾Τ
- 쥳Ʊͤˡ٤ƤΥСˤĤɽޤ
- </VarListEntry>
-
- <VarListEntry><Term>dump</Term>
- <ListItem><Para>
-<!--
- <literal/dump/ shows a short listing of every package in the cache. It is
- primarily for debugging.
--->
- <literal/dump/ ϥåˤѥåΡûɽޤ
- ˥ǥХåѤǤ
- </VarListEntry>
-
- <VarListEntry><Term>dumpavail</Term>
- <ListItem><Para>
-<!--
- <literal/dumpavail/ prints out an available list to stdout. This is
- suitable for use with &dpkg; and is used by the &dselect; method.
--->
- <literal/dumpavail/ ɸϤˡѲǽʤΤΰϤޤ
- &dpkg; ȶ˻ѤǤޤ &dselect; ǤѤޤ
- </VarListEntry>
-
- <VarListEntry><Term>unmet</Term>
- <ListItem><Para>
-<!--
- <literal/unmet/ displays a summary of all unmet dependencies in the
- package cache.
--->
- <literal/unmet/ ϥѥååΡŬʰ¸طγפ
- ɽޤ
- </VarListEntry>
-
- <VarListEntry><Term>show</Term>
- <ListItem><Para>
-<!--
- <literal/show/ performs a function similar to
- <command>dpkg - -print-avail</>, it displays the package records for the
- named packages.
--->
- <literal/show/ <command>dpkg --print-avail</> ˻ǽ¹Ԥޤ
- ꤷѥåΥѥå쥳ɤɽޤ
- </VarListEntry>
-
- <VarListEntry><Term>search</Term>
- <ListItem><Para>
-<!--
- <literal/search/ performs a full text search on all available package
- files for the regex pattern given. It searchs the package names and the
- descriptions for an occurance of the string and prints out the package
- name and the short description. If <option/- -full/ is given then output
- identical to <literal/show/ is produced for each matched package and
- if <option/- -names-only/ is given then the long description is not
- searched, only the package name is.
--->
- <literal/search/ Ϳ줿ɽˤäơ٤ƤѲǽ
- ѥåФʸԤޤѥå̾ФƸ
- Ԥѥå̾ûʸɽޤ
- <option/--full/ Ϳ줿硢ޥåѥåФ
- <literal/show/ ƱϤޤ
- <option/--names-only/ Ϳ줿ϡʸФƸԤ鷺
- ѥå̾ФƤΤоݤȤޤ
- <para>
-<!--
- Seperate arguments can be used to specified multiple search patterns that
- are and'd together.
--->
- Ƕڤäʣθѥ and Ȥ뤳ȤǤޤ
- </VarListEntry>
-
- <VarListEntry><Term>depends</Term>
- <ListItem><Para>
-<!--
- <literal/depends/ shows a listing of each dependency a package has
- and all the possible other packages that can fullfill that dependency.
--->
- <literal/depends/ ϡѥåäƤ¸طȡΰ¸ط
- ¾Υѥåΰɽޤ
- </VarListEntry>
-
- <VarListEntry><Term>pkgnames</Term>
- <ListItem><Para>
-<!--
- This command prints the name of each package in the system. The optional
- argument is a prefix match to filter the name list. The output is suitable
- for use in a shell tab complete function and the output is generated
- extremly quickly. This command is best used with the
- <option/- -generate/ option.
--->
- ΥޥɤϡƥǤγƥѥå̾Τɽޤ
- ץΰˤꡢƬפФ뤳ȤǤޤ
- νϤϥΥ֤ˤ䴰ǽǻȤ䤹ޤ®ޤ
- Υޥɤ <option/--generate/ ץȶ˻Ѥ
- Ǥ
- </VarListEntry>
- <VarListEntry><Term>dotty</Term>
- <ListItem><Para>
-<!--
- <literal/dotty/ takes a list of packages on the command line and
- gernerates output suitable for use by dotty from the
- <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>
- package. The result will be a set of nodes and edges representing the
- relationships between the packages. By default the given packages will
- trace out all dependent packages which can produce a very large graph.
- This can be turned off by setting the
- <literal>APT::Cache::GivenOnly</> option.
--->
- <literal/dotty/ ϡޥɥ饤Υѥå̾顢
- <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>
- ѥå dotty ޥɤѤΤʽϤޤ
- ̤ϥѥåδطɽ魯ΡɡåΥåȤɽޤ
- ǥեȤǤϡ٤Ƥΰ¸ѥåȥ졼Τǡ礭
- ޤޤ
- ϡ<literal>APT::Cache::GivenOnly</> ץDz
- ȤǤޤ
- <para>
-<!--
- The resulting nodes will have several shapse, normal packages are boxes,
- pure provides are triangles, mixed provides are diamonds,
- hexagons are missing packages. Orange boxes mean recursion was stopped
- [leaf packages], blue lines are prre-depends, green lines are conflicts.
--->
- ̤ΥΡɤϿηȤʤޤ
- ̾ѥåϻͳѡ㲾ۥѥåϻѡʣۥѥåɩ
- ϻѷϷѥå򤽤줾ɽޤ
- 󥸤λͳѤϺƵλ֥꡼եѥåסĤ pre-depends
- Ф϶ɽޤ
- <para>
-<!--
- Caution, dotty cannot graph larger sets of packages.
--->
- ) dotty ϥѥåΤ礭ʥåȤΥդޤ
- <VarListEntry><Term>policy</Term>
- <ListItem><Para>
-<!--
- <literal/policy/ is ment to help debug issues relating to the
- preferences file. With no arguments it will print out the
- priorities of each source. Otherwise it prints out detailed information
- about the priority selection of the named package.
--->
- <literal/policy/ եطˤĤơǥХåٱ礷ޤ
- ꤷʤä硢Ȥ̤ͥɽޤ
- ѥå̾ꤷ硢ͥξܺپɽޤ
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Options</>
--->
- <RefSect1><Title>ץ</>
- &apt-cmdblurb;
-
- <VariableList>
- <VarListEntry><term><option/-p/</><term><option/--pkg-cache/</>
- <ListItem><Para>
-<!--
- Select the file to store the package cache. The package cache is the
- primary cache used by all operations.
- Configuration Item: <literal/Dir::Cache::pkgcache/.
--->
- ѥååǼե򤷤ޤ
- ѥååϡ٤ƤǻѤ켡åǤ
- - <literal/Dir::Cache::pkgcache/
- </VarListEntry>
-
- <VarListEntry><term><option/-s/</><term><option/--src-cache/</>
- <ListItem><Para>
-<!--
- Select the file to store the source cache. The source is used only by
- <literal/gencaches/ and it stores a parsed version of the package
- information from remote sources. When building the package cache the
- source cache is used to advoid reparsing all of the package files.
- Configuration Item: <literal/Dir::Cache::srcpkgcache/.
--->
- åǼե򤷤ޤ
- Υå <literal/gencaches/ ǤΤ߻Ѥ졢
- ˲Ϥ줿Υѥå󤬳ǼƤޤ
- ѥååۤݤˡåϡ
- ѥåեƲϤ򤱤Ǥ
- <!--advoid avoid Υߥڥ롩 -->
- - <literal/Dir::Cache::srcpkgcache/
- </VarListEntry>
-
- <VarListEntry><term><option/-q/</><term><option/--quiet/</>
- <ListItem><Para>
-<!--
- Quiet; produces output suitable for logging, omitting progress indicators.
- More qs will produce more quite up to a maximum of 2. You can also use
- <option/-q=#/ to set the quiet level, overriding the configuration file.
- Configuration Item: <literal/quiet/.
--->
- Ų - ĽɽάƥȤΤʽϤԤޤ
- 2 Ĥޤ q Ťͤ뤳ȤǤŤˤǤޤ
- ޤ<option/-q=#/ Τ褦Ų٥ꤷơե
- 񤭤뤳ȤǤޤ
- - <literal/quiet/
- </VarListEntry>
-
- <VarListEntry><term><option/-i/</><term><option/--important/</>
- <ListItem><Para>
-<!--
- Print only important deps; for use with unmet causes only Depends and
- Pre-Depends relations to be printed.
- Configuration Item: <literal/APT::Cache::Important/.
--->
- ֽספΤɽ - Dipends Pre-Depends Τɽ뤿ᡢ
- unmet ȶ˻Ѥޤ
- - <literal/APT::Cache::Important/
- </VarListEntry>
-
- <VarListEntry><term><option/-f/</><term><option/--full/</>
- <ListItem><Para>
-<!--
- Print full package records when searching.
- Configuration Item: <literal/APT::Cache::ShowFull/.
--->
- search ѥå쥳ɤɽޤ
- - <literal/APT::Cache::ShowFull/
- </VarListEntry>
-
- <VarListEntry><term><option/-a/</><term><option/--all-versions/</>
- <ListItem><Para>
-<!--
- Print full records for all available versions, this is only applicable to
- the show command.
- Configuration Item: <literal/APT::Cache::AllVersions/.
--->
- ѲǽС쥳ɤɽޤ
- show ޥɤǤΤŬѤǤޤ
- - <literal/APT::Cache::AllVersions/
- </VarListEntry>
-
- <VarListEntry><term><option/-g/</><term><option/--generate/</>
- <ListItem><Para>
-<!--
- Perform automatic package cache regeneration, rather than use the cache
- as it is. This is the default, to turn it off use <option/- -no-generate/.
- Configuration Item: <literal/APT::Cache::Generate/.
--->
- ΤޤޥåѤΤǤϤʤưŪ˥ѥåå
- ޤϥǥեȤưǤ<option/--no-generate/
- Ѥ̵ˤǤޤ
- - <literal/APT::Cache::Generate/
- </VarListEntry>
-
- <VarListEntry><term><option/--names-only/</><term><option/-n/</>
- <ListItem><Para>
-<!--
- Only search on the package names, not the long description.
- Configuration Item: <literal/APT::Cache::NamesOnly/.
--->
- ʸǤϤʤѥå̾Τ߸ޤ
- - <literal/APT::Cache::NamesOnly/
- </VarListEntry>
-
- <VarListEntry><term><option/--all-names/</>
- <ListItem><Para>
-<!--
- Make <literal/pkgnames/ print all names, including virtual packages
- and missing dependencies.
- Configuration Item: <literal/APT::Cache::AllNames/.
--->
- <literal/pkgnames/ ǡۥѥåʰ¸طޤ᤿̾Τ
- ɽޤ
- - <literal/APT::Cache::AllNames/
- </VarListEntry>
-
- <VarListEntry><term><option/--recurse/</>
- <ListItem><Para>
-<!--
- Make <literal/depends/ recursive so that all packages mentioned are
- printed once.
- Configuration Item: <literal/APT::Cache::RecurseDepends/.
--->
- <literal/depends/ ǡꤷѥåƵŪ˰٤ɽޤ
- - <literal/APT::Cache::RecurseDepends/
- </VarListEntry>
-
- &apt-commonoptions;
-
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Files</>
--->
- <RefSect1><Title>ե</>
- <variablelist>
- <VarListEntry><term><filename>/etc/apt/sources.list</></term>
- <ListItem><Para>
-<!--
- locations to fetch packages from.
- Configuration Item: <literal/Dir::Etc::SourceList/.
--->
- ѥåμ
- - <literal/Dir::Etc::SourceList/
- </VarListEntry>
-
- <VarListEntry><term><filename>&statedir;/lists/</></term>
- <ListItem><Para>
-<!--
- storage area for state information for each package resource specified in
- &sources-list;
- Configuration Item: <literal/Dir::State::Lists/.
--->
- &sources-list; ˻ꤷѥå꥽Ȥξ־Ǽꥢ
- - <literal/Dir::State::Lists/
- </VarListEntry>
-
- <VarListEntry><term><filename>&statedir;/lists/partial/</></term>
- <ListItem><Para>
-<!--
- storage area for state information in transit.
- Configuration Item: <literal/Dir::State::Lists/ (implicit partial).
--->
- ־Ǽꥢ
- - <literal/Dir::State::Lists/ (ɬŪԴǤ)
- </VarListEntry>
- </variablelist>
- </RefSect1>
-
-<!--
- <RefSect1><Title>See Also</>
--->
- <RefSect1><Title>Ϣ</>
- <para>
- &apt-conf;, &sources-list;, &apt-get;
- </RefSect1>
-
-<!--
- <RefSect1><Title>Diagnostics</>
--->
- <RefSect1><Title>ǥå</>
- <para>
-<!--
- <command/apt-cache/ returns zero on normal operation, decimal 100 on error.
--->
- <command/apt-cache/ ェλ 0 ֤ޤ
- 顼ˤϽʤ 100 ֤ޤ
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;
-</refentry>
diff --git a/doc/ja/apt-cache.ja.8.xml b/doc/ja/apt-cache.ja.8.xml
new file mode 100644
index 000000000..1d30e224d
--- /dev/null
+++ b/doc/ja/apt-cache.ja.8.xml
@@ -0,0 +1,701 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-cache</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-cache</refname>
+<!--
+ <refpurpose>APT package handling utility -\- cache manipulator</refpurpose>
+-->
+ <refpurpose>APT パッケージ操作ユーティリティ -- キャッシュ操作</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-cache</command>
+ <arg><option>-hvsn</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group choice="req">
+ <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg>
+ <arg>gencaches</arg>
+ <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>stats</arg>
+ <arg>dump</arg>
+ <arg>dumpavail</arg>
+ <arg>unmet</arg>
+ <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg>
+ <arg>show <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>depends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>rdepends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg>
+ <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
+ <arg>madison <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-cache</command> performs a variety of operations on APT's package
+ cache. <command>apt-cache</command> does not manipulate the state of the system
+ but does provide operations to search and generate interesting output
+ from the package metadata.</para>
+-->
+ <para><command>apt-cache</command> は APT のパッケージキャッシュに対して、
+ さまざまな操作を行います。
+ <command>apt-cache</command> は、システム状態の操作は行いませんが、
+ パッケージのメタデータより検索したり、
+ 興味深い出力を生成するといった操作を提供します。</para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given, one of the
+ commands below must be present.</para>
+-->
+ <para><option>-h</option> オプションや <option>--help</option> オプションを除き、
+ 以下に挙げるコマンドが必要です。</para>
+
+ <variablelist>
+<!--
+ <varlistentry><term>add <replaceable>file(s)</replaceable></term>
+ <listitem><para><literal>add</literal> adds the named package index files to the package cache.
+ This is for debugging only.</para></listitem>
+-->
+ <varlistentry><term>add <replaceable>file(s)</replaceable></term>
+ <listitem><para><literal>add</literal> は、
+ パッケージキャッシュに指定したパッケージインデックスファイルを追加します。
+ デバッグ専用です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>gencaches</term>
+<!--
+ <listitem><para><literal>gencaches</literal> performs the same operation as
+ <command>apt-get check</command>. It builds the source and package caches from
+ the sources in &sources-list; and from
+ <filename>/var/lib/dpkg/status</filename>.</para></listitem>
+-->
+ <listitem><para><literal>gencaches</literal> は、
+ <command>apt-get check</command> と同じ動作を提供します。
+ これは &sources-list; 内の取得元と
+ <filename>/var/lib/dpkg/status</filename>から、
+ ソースとパッケージのキャッシュを構築します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>showpkg <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>showpkg</literal> displays information about the packages listed on the
+ command line. Remaining arguments are package names. The available
+ versions and reverse dependencies of each package listed are listed, as
+ well as forward dependencies for each version. Forward (normal)
+ dependencies are those packages upon which the package in question
+ depends; reverse dependencies are those packages that depend upon the
+ package in question. Thus, forward dependencies must be satisfied for a
+ package, but reverse dependencies need not be.
+ For instance, <command>apt-cache showpkg libreadline2</command> would produce
+ output similar to the following:</para>
+-->
+ <listitem><para><literal>showpkg</literal> は、
+ コマンドライン上に列挙したパッケージの情報を表示します。
+ 後に続く引数はパッケージ名となります。
+ 各パッケージについて、有効なバージョンと被依存関係を列挙し、
+ さらにその各バージョンについて依存関係を表示します。
+ (通常の) 依存関係とは、対象のパッケージが依存しているパッケージを指します。
+ また、被依存関係とは、対象のパッケージに依存しているパッケージを指します。
+ 従って、パッケージの依存関係は満たさなければなりませんが、
+ 被依存関係は満たす必要はありません。
+ 実例として、以下に <command>apt-cache showpkg libreadline2</command> の
+ 出力を掲げます。</para>
+
+<informalexample><programlisting>
+Package: libreadline2
+Versions: 2.1-12(/var/state/apt/lists/foo_Packages),
+Reverse Depends:
+ libreadlineg2,libreadline2
+ libreadline2-altdev,libreadline2
+Dependencies:
+2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))
+Provides:
+2.1-12 -
+Reverse Provides:
+</programlisting></informalexample>
+
+<!--
+ <para>Thus it may be seen that libreadline2, version 2.1-12, depends on
+ libc5 and ncurses3.0 which must be installed for libreadline2 to work.
+ In turn, libreadlineg2 and libreadline2-altdev depend on libreadline2. If
+ libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be
+ installed; libreadlineg2 and libreadline2-altdev do not have to be
+ installed. For the specific meaning of the remainder of the output it
+ is best to consult the apt source code.</para></listitem>
+ </varlistentry>
+-->
+ <para>つまり、libreadline2 の version 2.1-12 は、
+ libc5 と ncurses3.0 に依存していて、libreadline2 が動作するには、
+ これらをインストールする必要があるということが判ります。
+ 一方、libreadlineg2 と libreadline2-altdev は libreadline2 に依存しています。
+ libreadline2 をインストールするためには、libc5, ncurses3.0, ldso を
+ すべてインストールしなければなりませんが、libreadlineg2 と
+ libreadline2-altdev はインストールする必要はありません。
+ 出力の残りの部分の意味については、
+ apt のソースコードを調べるのが最良でしょう。</para></listitem>
+ </varlistentry>
+
+<!--
+ <varlistentry><term>stats</term><listitem><para><literal>stats</literal> displays some statistics about the cache.
+ No further arguments are expected. Statistics reported are:
+-->
+ <varlistentry><term>stats</term><listitem><para><literal>stats</literal>
+ はキャッシュについての統計情報を表示します。
+ それ以上、引数は必要ありません。以下の統計情報を表示します。
+ <itemizedlist>
+<!--
+ <listitem><para><literal>Total package names</literal> is the number of package names found
+ in the cache.</para>
+ </listitem>
+-->
+ <listitem><para><literal>パッケージ名総数</literal>は、
+ キャッシュに存在するパッケージ数を表します。</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Normal packages</literal> is the number of regular, ordinary package
+ names; these are packages that bear a one-to-one correspondence between
+ their names and the names used by other packages for them in
+ dependencies. The majority of packages fall into this category.</para>
+ </listitem>
+-->
+ <listitem><para><literal>通常パッケージ</literal>は、
+ 公式の普通のパッケージ数を表します。
+ これは、他のパッケージの依存関係で使用された名称で、それが一対一に対応
+ するパッケージです。
+ 大多数のパッケージはこのカテゴリに入ります。</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Pure virtual packages</literal> is the number of packages that exist
+ only as a virtual package name; that is, packages only "provide" the
+ virtual package name, and no package actually uses the name. For
+ instance, "mail-transport-agent" in the Debian GNU/Linux system is a
+ pure virtual package; several packages provide "mail-transport-agent",
+ but there is no package named "mail-transport-agent".</para>
+ </listitem>
+-->
+ <listitem><para><literal>純粋仮想パッケージ</literal>は、
+ 仮想パッケージ名としてのみ存在するパッケージ
+ (仮想パッケージ名のみを「提供」し、
+ 実際にはいかなるパッケージもその名称を持たない) の数を表します。
+ 例えば、Debian GNU/Linux システムでは "mail-transport-agent"
+ は純粋仮想パッケージです。
+ "mail-transport-agent" を提供するパッケージはいくつもありますが、
+ "mail-transport-agent" という名称のパッケージはありません。</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Single virtual packages</literal> is the number of packages with only
+ one package providing a particular virtual package. For example, in the
+ Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but
+ only one package, xless, provides "X11-text-viewer".</para>
+ </listitem>
+-->
+ <listitem><para><literal>単一仮想パッケージ</literal>は、
+ 特定の仮想パッケージ名を提供するパッケージが、
+ ただ一つの場合の数を表します。
+ 例えば、Debian GNU/Linux システムでは、"X11-text-viewer"
+ は仮想パッケージですが、"X11-text-viewer" を提供するパッケージは、
+ xless パッケージのみということです。</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Mixed virtual packages</literal> is the number of packages that either
+ provide a particular virtual package or have the virtual package name
+ as the package name. For instance, in the Debian GNU/Linux system,
+ "debconf" is both an actual package, and provided by the debconf-tiny
+ package.</para>
+ </listitem>
+-->
+ <listitem><para><literal>複合仮想パッケージ</literal>は、
+ その仮想パッケージ名を提供するパッケージが複数あるか、
+ またパッケージ名と同じ仮想パッケージ名を持つパッケージ数を表します。
+ 例えば、Debian GNU/Linux システムでは、
+ debconf は実際のパッケージ名でもありますが、
+ debconf-tiny によって提供もされています。</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Missing</literal> is the number of package names that were referenced in
+ a dependency but were not provided by any package. Missing packages may
+ be in evidence if a full distribution is not accessed, or if a package
+ (real or virtual) has been dropped from the distribution. Usually they
+ are referenced from Conflicts statements.</para>
+ </listitem>
+-->
+ <listitem><para><literal>欠落</literal>は、依存関係中には存在するのに、
+ どのパッケージにも提供されていないパッケージ名の数を表します。
+ このパッケージがあるということは、
+ 全ディストリビューションにアクセスできていないか、
+ (実ないし仮想) パッケージがディストリビューションからはずされてしまった可能性もあります。
+ 通常では、構文が矛盾するとこのようになります。</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Total distinct</literal> versions is the number of package versions
+ found in the cache; this value is therefore at least equal to the
+ number of total package names. If more than one distribution (both
+ "stable" and "unstable", for instance), is being accessed, this value
+ can be considerably larger than the number of total package names.</para>
+ </listitem>
+-->
+ <listitem><para><literal>個別バージョン総数</literal>は、
+ キャッシュに存在するパッケージのバージョンの数を表します。
+ そのため、この値は最小でもパッケージ名総数と一致します。
+ もし複数のディストリビューション (例 "stable" と "unstable" の両方)
+ を利用した場合、
+ この値はパッケージ名総数よりもかなり大きい数になります。</para>
+ </listitem>
+
+<!--
+ <listitem><para><literal>Total dependencies</literal> is the number of dependency relationships
+ claimed by all of the packages in the cache.</para>
+ </listitem>
+-->
+ <listitem><para><literal>依存関係総数</literal>は、
+ キャッシュにあるすべてのパッケージで要求された依存関係の数です。</para>
+ </listitem>
+ </itemizedlist>
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>showsrc <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>showsrc</literal> displays all the source package records that match
+ the given package names. All versions are shown, as well as all
+ records that declare the name to be a Binary.</para></listitem>
+ </varlistentry>
+-->
+ <listitem><para><literal>showsrc</literal> は、
+ 指定したパッケージ名に一致するソースパッケージを、すべて表示します。
+ バイナリになるときの名称を宣言したレコードと同様に、
+ すべてのバージョンについて表示します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>dump</term>
+<!--
+ <listitem><para><literal>dump</literal> shows a short listing of every package in the cache. It is
+ primarily for debugging.</para></listitem>
+ </varlistentry>
+-->
+ <listitem><para><literal>dump</literal> は、
+ キャッシュ内のパッケージそれぞれについて、短い一覧を表示します。
+ 主にデバッグ用です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>dumpavail</term>
+<!--
+ <listitem><para><literal>dumpavail</literal> prints out an available list to stdout. This is
+ suitable for use with &dpkg; and is used by the &dselect; method.</para></listitem>
+-->
+ <listitem><para><literal>dumpavail</literal> は、
+ 標準出力に利用可能なものの一覧を出力します。
+ &dpkg; と共に使用すると便利ですし、
+ &dselect; でも使用されます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>unmet</term>
+<!--
+ <listitem><para><literal>unmet</literal> displays a summary of all unmet dependencies in the
+ package cache.</para></listitem>
+ </varlistentry>
+-->
+ <listitem><para><literal>unmet</literal> は、
+ パッケージキャッシュ内にある、
+ 不適当な依存関係の概要を表示します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>show <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>show</literal> performs a function similar to
+ <command>dpkg -\-print-avail</command>; it displays the package records for the
+ named packages.</para></listitem>
+-->
+ <listitem><para><literal>show</literal> は、
+ <command>dpkg --print-avail</command> と同様の機能を実行します。
+ これは、指定したパッケージのパッケージレコードの表示です。</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>search <replaceable>regex [ regex ... ]</replaceable></term>
+<!--
+ <listitem><para><literal>search</literal> performs a full text search on all available package
+ lists for the regex pattern given. It searches the package names and the
+ descriptions for an occurrence of the regular expression and prints out
+ the package name and the short description. If <option>-\-full</option> is given
+ then output identical to <literal>show</literal> is produced for each matched
+ package, and if <option>-\-names-only</option> is given then the long description
+ is not searched, only the package name is.</para>
+-->
+ <listitem><para><literal>search</literal> は、与えられた正規表現によって、
+ すべての利用可能なパッケージに対して全文検索を行います。
+ パッケージ名と説明に対して検索を行い、
+ パッケージ名と短い説明文を表示します。
+ <option>--full</option> が与えられた場合、マッチしたパッケージに対し
+ <literal>show</literal> と同じ情報を出力します。
+ <option>--names-only</option> が与えられた場合は、
+ 説明文に対して検索を行わず、パッケージ名に対してのみ対象とします。</para>
+ <para>
+<!--
+ Separate arguments can be used to specify multiple search patterns that
+ are and'ed together.</para></listitem>
+-->
+ 空白で区切った引数で、
+ 複数の検索パターンの and をとることができます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>depends <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>depends</literal> shows a listing of each dependency a package has
+ and all the possible other packages that can fulfill that dependency.</para></listitem>
+-->
+ <listitem><para><literal>depends</literal> は、
+ パッケージが持っている依存関係と、
+ その依存関係を満たす他のパッケージの一覧を表示します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a
+ package has.</para></listitem>
+-->
+ <listitem><para><literal>rdepends</literal> は、
+ パッケージが持つ被依存関係を一覧表示します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>pkgnames <replaceable>[ prefix ]</replaceable></term>
+<!--
+ <listitem><para>This command prints the name of each package in the system. The optional
+ argument is a prefix match to filter the name list. The output is suitable
+ for use in a shell tab complete function and the output is generated
+ extremely quickly. This command is best used with the
+ <option>-\-generate</option> option.</para></listitem>
+-->
+ <listitem><para>このコマンドは、
+ システムでの各パッケージの名称を表示します。
+ オプションの引数により、取得する一覧より先頭一致で抽出することができます。
+ この出力はシェルのタブによる補完機能に使いやすく、
+ また非常に速く生成されます。
+ このコマンドは <option>--generate</option> オプションと共に使用すると、
+ 非常に便利です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>dotty <replaceable>pkg(s)</replaceable></term>
+<!--
+ <listitem><para><literal>dotty</literal> takes a list of packages on the command line and
+ generates output suitable for use by dotty from the
+ <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink>
+ package. The result will be a set of nodes and edges representing the
+ relationships between the packages. By default the given packages will
+ trace out all dependent packages; this can produce a very large graph.
+ To limit the output to only the packages listed on the command line,
+ set the <literal>APT::Cache::GivenOnly</literal> option.</para>
+-->
+ <listitem><para><literal>dotty</literal> は、
+ コマンドライン上のパッケージ名から、
+ <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink>
+ パッケージの dotty コマンドで利用するのに便利な出力を生成します。
+ 結果はパッケージの関係を表わす、ノード・エッジのセットで表現されます。
+ デフォルトでは、すべての依存パッケージをトレースするので、
+ 非常に大きい図が得られます。
+ これは、<literal>APT::Cache::GivenOnly</literal>
+ オプションを設定して解除できます。</para>
+
+<!--
+ <para>The resulting nodes will have several shapes; normal packages are boxes,
+ pure provides are triangles, mixed provides are diamonds,
+ missing packages are hexagons. Orange boxes mean recursion was stopped
+ [leaf packages], blue lines are pre-depends, green lines are conflicts.</para>
+-->
+ <para>結果のノードは数種の形状をとります。
+ 通常パッケージは四角、純粋仮想パッケージは三角、複合仮想パッケージは菱形、
+ 六角形は欠落パッケージをそれぞれ表します。
+ オレンジの四角は再帰が終了した「リーフパッケージ」、青い線は先行依存、
+ 緑の線は競合を表します。</para>
+
+<!--
+ <para>Caution, dotty cannot graph larger sets of packages.</para></listitem>
+-->
+ <para>注意) dotty は、
+ パッケージのより大きなセットのグラフは描けません。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>policy <replaceable>[ pkg(s) ]</replaceable></term>
+<!--
+ <listitem><para><literal>policy</literal> is meant to help debug issues relating to the
+ preferences file. With no arguments it will print out the
+ priorities of each source. Otherwise it prints out detailed information
+ about the priority selection of the named package.</para></listitem>
+-->
+ <listitem><para><literal>policy</literal> は、
+ 設定ファイル関係の問題について、デバッグを支援します。
+ 引数を指定しなかった場合、取得元ごとの優先順位を表示します。
+ 一方、パッケージ名を指定した場合、
+ 優先順の詳細情報を表示します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>madison <replaceable>/[ pkg(s) ]</replaceable></term>
+<!--
+ <listitem><para><literal>apt-cache</literal>'s <literal>madison</literal> command attempts to mimic
+ the output format and a subset of the functionality of the Debian
+ archive management tool, <literal>madison</literal>. It displays
+ available versions of a package in a tabular format. Unlike the
+ original <literal>madison</literal>, it can only display information for
+ the architecture for which APT has retrieved package lists
+ (<literal>APT::Architecture</literal>).</para></listitem>
+-->
+ <listitem><para><literal>apt-cache</literal> の <literal>madison</literal>
+ コマンドは、Debian アーカイブ管理ツール <literal>madison</literal>
+ の機能のサブセットで、出力フォーマットを真似ようとします。
+ パッケージの利用可能バージョンを表形式で表示します。
+ オリジナルの <literal>madison</literal> と違い、
+ APT がパッケージ一覧を検索したアーキテクチャ
+ (<literal>APT::Architecture</literal>)
+ の情報を表示するだけです。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-p</option></term><term><option>--pkg-cache</option></term>
+<!--
+ <listitem><para>Select the file to store the package cache. The package cache is the
+ primary cache used by all operations.
+ Configuration Item: <literal>Dir::Cache::pkgcache</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージキャッシュを格納するファイルを選択します。
+ パッケージキャッシュは、すべての操作で使用される一次キャッシュです。
+ 設定項目 - <literal>Dir::Cache::pkgcache</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-s</option></term><term><option>--src-cache</option></term>
+<!--
+ <listitem><para>Select the file to store the source cache. The source is used only by
+ <literal>gencaches</literal> and it stores a parsed version of the package
+ information from remote sources. When building the package cache the
+ source cache is used to advoid reparsing all of the package files.
+ Configuration Item: <literal>Dir::Cache::srcpkgcache</literal>.</para></listitem>
+-->
+ <listitem><para>ソースキャッシュを格納するファイルを選択します。
+ このソースキャッシュは <literal>gencaches</literal> でのみ使用され、
+ ここに解析された取得元のパッケージ情報が格納されています。
+ パッケージキャッシュを構築する際に、ソースキャッシュは、
+ 全パッケージファイルを再解析を避ける上で便利です。
+ <!--advoid は avoid のミススペル? -->
+ 設定項目 - <literal>Dir::Cache::srcpkgcache</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+<!--
+ <listitem><para>Quiet; produces output suitable for logging, omitting progress indicators.
+ More q's will produce more quietness up to a maximum of 2. You can also use
+ <option>-q=#</option> to set the quietness level, overriding the configuration file.
+ Configuration Item: <literal>quiet</literal>.</para></listitem>
+-->
+ <listitem><para>静粛 - 進捗表示を省略し、
+ ログをとるのに便利な出力を行います。
+ 最大 2 つまで q を重ねることでさらに静粛にできます。
+ また、<option>-q=#</option> のように静粛レベルを指定して、
+ 設定ファイルを上書きすることもできます。
+ 設定項目 - <literal>quiet</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-i</option></term><term><option>--important</option></term>
+<!--
+ <listitem><para>Print only important dependencies; for use with unmet. Causes only Depends and
+ Pre-Depends relations to be printed.
+ Configuration Item: <literal>APT::Cache::Important</literal>.</para></listitem>
+-->
+ <listitem><para>「重要」依存関係のみ表示 - unmet と共に使用します。
+ これは「依存」関係と「先行依存」関係のみを表示するためです。
+ 設定項目 - <literal>APT::Cache::Important</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-f</option></term><term><option>--full</option></term>
+<!--
+ <listitem><para>Print full package records when searching.
+ Configuration Item: <literal>APT::Cache::ShowFull</literal>.</para></listitem>
+-->
+ <listitem><para>search 時に全パッケージレコードを表示します。
+ 設定項目 - <literal>APT::Cache::ShowFull</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-a</option></term><term><option>--all-versions</option></term>
+<!--
+ <listitem><para>Print full records for all available versions. This is the
+ default; to turn it off, use <option>-\-no-all-versions</option>.
+ If <option>-\-no-all-versions</option> is specified, only the candidate version
+ will displayed (the one which would be selected for installation).
+ This option is only applicable to the <literal>show</literal> command.
+ Configuration Item: <literal>APT::Cache::AllVersions</literal>.</para></listitem>
+-->
+ <listitem><para>全利用可能バージョンのレコード全体を表示します。
+ これはデフォルトの動作で、
+ 無効にするには <option>--no-all-versions</option> を使用してください。
+ <option>--no-all-versions</option> を指定すると、
+ 候補バージョン (インストールの際に選択されるもの) だけ表示します。
+ このオプションは、show コマンドでのみ適用できます。
+ 設定項目 - <literal>APT::Cache::AllVersions</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-g</option></term><term><option>--generate</option></term>
+<!--
+ <listitem><para>Perform automatic package cache regeneration, rather than use the cache
+ as it is. This is the default; to turn it off, use <option>-\-no-generate</option>.
+ Configuration Item: <literal>APT::Cache::Generate</literal>.</para></listitem>
+-->
+ <listitem><para>そのままキャッシュを使用するのではなく、
+ 自動的にパッケージキャッシュを再生成します。これはデフォルトの動作で、
+ 無効にするには <option>--no-generate</option> を使用してください。
+ 設定項目 - <literal>APT::Cache::Generate</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--names-only</option></term><term><option>-n</option></term>
+<!--
+ <listitem><para>Only search on the package names, not the long descriptions.
+ Configuration Item: <literal>APT::Cache::NamesOnly</literal>.</para></listitem>
+-->
+ <listitem><para>説明文ではなく、パッケージ名からのみ検索します。
+ 設定項目 - <literal>APT::Cache::NamesOnly</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--all-names</option></term>
+<!--
+ <listitem><para>Make <literal>pkgnames</literal> print all names, including virtual packages
+ and missing dependencies.
+ Configuration Item: <literal>APT::Cache::AllNames</literal>.</para></listitem>
+-->
+ <listitem><para><literal>pkgnames</literal> で、
+ 仮想パッケージや欠落依存関係を含めた全名称を表示します。
+ 設定項目 - <literal>APT::Cache::AllNames</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--recurse</option></term>
+<!--
+ <listitem><para>Make <literal>depends</literal> and <literal>rdepends</literal> recursive so
+ that all packages mentioned are printed once.
+ Configuration Item: <literal>APT::Cache::RecurseDepends</literal>.</para></listitem>
+-->
+ <listitem><para><literal>depends</literal> や <literal>rdepends</literal>
+ で、指定した全パッケージを再帰的に一度に表示します。
+ 設定項目 - <literal>APT::Cache::RecurseDepends</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--installed</option></term>
+<!--
+ <listitem><para>
+ Limit the output of <literal>depends</literal> and <literal>rdepends</literal> to
+ packages which are currently installed.
+ Configuration Item: <literal>APT::Cache::Installed</literal>.</para></listitem>
+-->
+ <listitem><para>
+ <literal>depends</literal> や <literal>rdepends</literal> の出力を、
+ 現在インストールされているパッケージに限定します。
+ 設定項目 - <literal>APT::Cache::Installed</literal></para></listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+ <variablelist>
+ <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
+<!--
+ <listitem><para>Locations to fetch packages from.
+ Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージの取得元。
+ 設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&statedir;/lists/</filename></term>
+<!--
+ <listitem><para>Storage area for state information for each package resource specified in
+ &sources-list;
+ Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
+-->
+ <listitem><para>&sources-list; に指定した、
+ パッケージリソースごとの状態情報格納エリア。
+ 設定項目 - <literal>Dir::State::Lists</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
+<!--
+ <listitem><para>Storage area for state information in transit.
+ Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
+-->
+ <listitem><para>取得中状態情報格納エリア。
+ 設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;, &sources-list;, &apt-get;
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-cache</command> returns zero on normal operation, decimal 100 on error.
+ </para>
+-->
+ <para><command>apt-cache</command> は正常終了時に 0 を返します。
+ エラー時には十進の 100 を返します。
+ </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+</refentry>
diff --git a/doc/ja/apt-cdrom.ja.8.sgml b/doc/ja/apt-cdrom.ja.8.sgml
deleted file mode 100644
index 4328ef8c2..000000000
--- a/doc/ja/apt-cdrom.ja.8.sgml
+++ /dev/null
@@ -1,230 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.3 -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
-
- <refmeta>
- <refentrytitle>apt-cdrom</>
- <manvolnum>8</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
- <refname>apt-cdrom</>
-<!--
- <refpurpose>APT CDROM managment utility</>
--->
- <refpurpose>APT CDROM 桼ƥƥ</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>apt-cdrom</>
- <arg><option>-hvrmfan</></arg>
- <arg><option>-d=<replaceable/cdrom mount point/</></arg>
- <arg><option>-o=<replaceable/config string/</></arg>
- <arg><option>-c=<replaceable/file/</></arg>
- <group choice=req>
- <arg>add</>
- <arg>ident</>
- </group>
- </cmdsynopsis>
- </refsynopsisdiv>
-
-<!--
- <RefSect1><Title>Description</>
--->
- <RefSect1><Title></>
- <para>
-<!--
- <command/apt-cdrom/ is used to add a new CDROM to APTs list of available
- sources. <command/apt-cdrom/ takes care of determining the structure of
- the disc as well as correcting for several possible mis-burns and
- verifying the index files.
--->
- <command/apt-cdrom/ ѲǽʼȤơAPT ΥꥹȤ˿ CDROM
- ɲäΤǤ<command/apt-cdrom/ ϾƤ»ǽʸ¤
- ǥ¤γǧޤޤǥåեγǧԤޤ
- <para>
-<!--
- It is necessary to use <command/apt-cdrom/ to add CDs to the APT system,
- it cannot be done by hand. Furthermore each disk in a multi-cd set must be
- inserted and scanned separately to account for possible mis-burns.
--->
- APT ƥ CD ɲäΤϼȤǤ񤷤ᡢ<command/apt-cdrom/
- ɬפǤξ塢CD åȤΥǥ 1 ŤġƤ»Ǥ뤫
- ɾʤФʤޤ
- <para>
-<!--
- Unless the <option/-h/, or <option/- -help/ option is given one of the
- commands below must be present.
--->
- <option/-h/ <option/--help/ ʲ˵󤲤륳ޥɤɬפǤ
- <VariableList>
- <VarListEntry><Term>add</Term>
- <ListItem><Para>
-<!--
- <literal/add/ is used to add a new disc to the source list. It will unmount the
- CDROM device, prompt for a disk to be inserted and then procceed to
- scan it and copy the index files. If the disc does not have a proper
- <filename>.disk/</> directory you will be prompted for a descriptive
- title.
--->
- <literal/add/ ϡǥꥹȤɲäޤ
- CDROM ǥХΥޥȡǥΥץץȤɽθˡ
- ǥΥȥǥåեΥԡԤޤ
- ǥ <filename>.disk/</> ǥ쥯ȥ꤬¸ߤʤ硢
- ȥϤ褦¥ޤ
- <para>
-<!--
- APT uses a CDROM ID to track which disc is currently in the drive and
- maintains a database of these IDs in
- <filename>&statedir;/cdroms.list</>
--->
- APT ϡߥɥ饤֤ˤǥΥȥåCDROM ID
- Ѥޤޤ ID <filename>&statedir;/cdroms.list</>
- ǡ١Ǵޤ
- </VarListEntry>
-
- <VarListEntry><Term>ident</Term>
- <ListItem><Para>
-<!--
- A debugging tool to report the identity of the current disc as well
- as the stored file name
--->
- ǼƤե̾ȡߤΥǥƱ줫ɤݡȤ롢
- ǥХåġǤ
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Options</>
--->
- <RefSect1><Title>ץ</>
-
- &apt-cmdblurb;
-
- <VariableList>
- <VarListEntry><term><option/-d/</><term><option/--cdrom/</>
- <ListItem><Para>
-<!--
- Mount point; specify the location to mount the cdrom. This mount
- point must be listed in <filename>/etc/fstab</> and propely configured.
- Configuration Item: <literal/Acquire::cdrom::mount/.
--->
- ޥȥݥ - cdrom ޥȤꤷޤ
- ΥޥȥݥȤϡ<filename>/etc/fstab</> ꤵƤ
- ɬפޤ
- - <literal/Acquire::cdrom::mount/
- </VarListEntry>
-
- <VarListEntry><term><option/-r/</><term><option/--rename/</>
- <ListItem><Para>
-<!--
- Rename a disc; change the label of a disk or override the disks
- given label. This option will cause <command/apt-cdrom/ to prompt for
- a new label.
- Configuration Item: <literal/APT::CDROM::Rename/.
--->
- ǥ̾ѹ - ꤷ̾ǥǥΥ٥ѹޤ
- Υץˤꡢ<command/apt-cdrom/ ٥Ϥ褦
- ¥ޤ
- - <literal/APT::CDROM::Rename/
- </VarListEntry>
-
- <VarListEntry><term><option/-m/</><term><option/--no-mount/</>
- <ListItem><Para>
-<!--
- No mounting; prevent <command/apt-cdrom/ from mounting and unmounting
- the mount point.
- Configuration Item: <literal/APT::CDROM::NoMount/.
--->
- ޥȤʤ - <command/apt-cdrom/ ޥȥݥȤ
- ޥȡޥȤΤɤޤ
- - <literal/APT::CDROM::NoMount/
- </VarListEntry>
-
- <VarListEntry><term><option/-f/</><term><option/--fast/</>
- <ListItem><Para>
-<!--
- Fast Copy; Assume the package files are valid and do not check
- every package. This option should be used only if
- <command/apt-cdrom/ has been run on this disc before and did not detect
- any errors.
- Configuration Item: <literal/APT::CDROM::Fast/.
--->
- ®ԡ - ѥåե뤬ǤȲꤷ
- åԤޤ󡣡
- ΥץϡΥǥǰ <command/apt-cdrom/ ԤäƤꡢ
- 顼򸡽ФʤäΤ߻Ѥ٤Ǥ
- - <literal/APT::CDROM::Fast/
- </VarListEntry>
-
- <VarListEntry><term><option/-a/</><term><option/--thorough/</>
- <ListItem><Para>
-<!--
- Thorough Package Scan; This option may be needed with some old
- Debian 1.1/1.2 discs that have Package files in strange places. It
- takes much longer to scan the CD but will pick them all up.
--->
- ѥå - Ť Debian 1.1/1.2 Υǥϡ
- ѥåե뤬㤦ˤ뤿ᡢΥץȤɬפ
- 뤫⤷ޤ
- CD 򥹥󤹤Τ˻֤ޤѥåե
- Ф뤳ȤǤޤ
- </VarListEntry>
-
- <VarListEntry><term><option/-n/</>
- <term><option/--just-print/</>
- <term><option/--recon/</>
- <term><option/--no-act/</>
- <ListItem><Para>
-<!--
- No Changes; Do not change the &sources-list; file and do not
- write index files. Everything is still checked however.
- Configuration Item: <literal/APT::CDROM::NoAct/.
--->
- ѹʤ - &sources-list; եѹ䡢ǥåե
- 񤭹ߤԤޤ󡣤ȤϤ٤ƤΥåϹԤޤ
- - <literal/APT::CDROM::NoAct/
- </VarListEntry>
-
- &apt-commonoptions;
-
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>See Also</>
--->
- <RefSect1><Title>Ϣ</>
- <para>
- &apt-conf;, &apt-get;, &sources-list;
- </RefSect1>
-
-<!--
- <RefSect1><Title>Diagnostics</>
--->
- <RefSect1><Title>ǥå</>
- <para>
-<!--
- <command/apt-cdrom/ returns zero on normal operation, decimal 100 on error.
--->
- <command/apt-get/ ェλ 0 ֤ޤ
- 顼ˤϽʤ 100 ֤ޤ
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;
-</refentry>
-
diff --git a/doc/ja/apt-cdrom.ja.8.xml b/doc/ja/apt-cdrom.ja.8.xml
new file mode 100644
index 000000000..bf84b4749
--- /dev/null
+++ b/doc/ja/apt-cdrom.ja.8.xml
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <date>14 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-cdrom</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-cdrom</refname>
+<!--
+ <refpurpose>APT CDROM management utility</refpurpose>
+-->
+ <refpurpose>APT CDROM 管理ユーティリティ</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-cdrom</command>
+ <arg><option>-hvrmfan</option></arg>
+ <arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group>
+ <arg>add</arg>
+ <arg>ident</arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-cdrom</command> is used to add a new CDROM to APTs list
+ of available sources. <command>apt-cdrom</command> takes care of
+ determining the structure of
+ the disc as well as correcting for several possible mis-burns and
+ verifying the index files.
+ </para>
+-->
+ <para><command>apt-cdrom</command> は利用可能な取得元として、
+ APT のリストに新しい CDROM を追加するのに便利です。
+ <command>apt-cdrom</command> は焼き損じを可能な限り補正し、
+ ディスク構造の確認を助けます。また、インデックスファイルの確認を行います。
+ </para>
+
+<!--
+ <para>It is necessary to use <command>apt-cdrom</command> to add CDs to the
+ APT system,
+ it cannot be done by hand. Furthermore each disk in a multi-cd set must be
+ inserted and scanned separately to account for possible mis-burns.
+ </para>
+-->
+ <para>APT システムに手作業で CD を追加するのは難しいため、
+ <command>apt-cdrom</command> が必要になります。
+ その上、CD セットのディスクを 1 枚づつ、
+ 焼き損じを補正できるか評価しなければなりません。
+ </para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is
+ given one of the commands below must be present.
+-->
+ <para><option>-h</option> オプションや <option>--help</option> オプションを除き、
+ 以下に挙げるコマンドが必要です。
+
+ <variablelist>
+ <varlistentry><term>add</term>
+<!--
+ <listitem><para><literal>add</literal> is used to add a new disc to the
+ source list. It will unmount the
+ CDROM device, prompt for a disk to be inserted and then procceed to
+ scan it and copy the index files. If the disc does not have a proper
+ <filename>disk</filename> directory you will be prompted for a descriptive
+ title.
+-->
+ <listitem><para><literal>add</literal> は、
+ 新しいディスクを取得元リストに追加します。
+ CDROM デバイスのアンマウント、ディスク挿入のプロンプトの表示の後に、
+ ディスクのスキャンとインデックスファイルのコピーを行います。
+ ディスクに正しい <filename>disk</filename> ディレクトリが存在しない場合、
+ タイトルを入力するよう促します。
+ </para>
+
+<!--
+ <para>APT uses a CDROM ID to track which disc is currently in the drive and
+ maintains a database of these IDs in
+ <filename>&statedir;/cdroms.list</filename>
+-->
+ <para>APT は、現在ドライブにあるディスクのトラックから取得した、
+ CDROM ID を使用します。またその ID を、
+ <filename>&statedir;/cdroms.list</filename> 内のデータベースで管理します。
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>ident</term>
+<!--
+ <listitem><para>A debugging tool to report the identity of the current
+ disc as well as the stored file name
+-->
+ <listitem><para>格納されているファイル名と、
+ 現在のディスクが同一かどうかをレポートする、デバッグツールです。
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+ <refsect1><title>Options</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-d</option></term><term><option>--cdrom</option></term>
+<!--
+ <listitem><para>Mount point; specify the location to mount the cdrom. This
+ mount point must be listed in <filename>/etc/fstab</filename> and
+ properly configured.
+ Configuration Item: <literal>Acquire::cdrom::mount</literal>.
+-->
+ <listitem><para>マウントポイント - cdrom をマウントする場所を指定します。
+ このマウントポイントは、
+ <filename>/etc/fstab</filename> に正しく設定されている必要があります。
+ 設定項目 - <literal>Acquire::cdrom::mount</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-r</option></term><term><option>--rename</option></term>
+<!--
+ <listitem><para>Rename a disc; change the label of a disk or override the
+ disks given label. This option will cause <command>apt-cdrom</command> to
+ prompt for a new label.
+ Configuration Item: <literal>APT::CDROM::Rename</literal>.
+-->
+ <listitem><para>ディスクの名前変更 -
+ 指定した名前でディスクのラベルを変更・更新します。このオプションにより、
+ <command>apt-cdrom</command> が新しいラベルを入力するよう促します。
+ 設定項目 - <literal>APT::CDROM::Rename</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-m</option></term><term><option>--no-mount</option></term>
+<!--
+ <listitem><para>No mounting; prevent <command>apt-cdrom</command> from
+ mounting and unmounting the mount point.
+ Configuration Item: <literal>APT::CDROM::NoMount</literal>.
+-->
+ <listitem><para>マウントなし - <command>apt-cdrom</command> が、
+ マウントポイントにマウント・アンマウントしないようにします。
+ 設定項目 - <literal>APT::CDROM::NoMount</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-f</option></term><term><option>--fast</option></term>
+<!--
+ <listitem><para>Fast Copy; Assume the package files are valid and do not
+ check every package. This option should be used only if
+ <command>apt-cdrom</command> has been run on this disc before and did not
+ detect any errors.
+ Configuration Item: <literal>APT::CDROM::Fast</literal>.
+-->
+ <listitem><para>高速コピー - パッケージファイルが妥当であると仮定し、
+ チェックを全く行いません。このオプションは、
+ このディスクで以前 <command>apt-cdrom</command> を行っており、
+ エラーを検出しなかった場合のみ使用すべきです。
+ 設定項目 - <literal>APT::CDROM::Fast</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-a</option></term><term><option>--thorough</option></term>
+<!--
+ <listitem><para>Thorough Package Scan; This option may be needed with some
+ old Debian 1.1/1.2 discs that have Package files in strange places. It
+ takes much longer to scan the CD but will pick them all up.
+-->
+ <listitem><para>完全パッケージスキャン -
+ 古い Debian 1.1/1.2 のディスクは、パッケージファイルが違う場所にあるため、
+ このオプションを使う必要があるかもしれません。
+ CD をスキャンするのに非常に時間がかかりますが、
+ 全パッケージファイルを抽出することができます。
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-n</option></term>
+ <term><option>--just-print</option></term>
+ <term><option>--recon</option></term>
+ <term><option>--no-act</option></term>
+<!--
+ <listitem><para>No Changes; Do not change the &sources-list; file and do
+ not write index files. Everything is still checked however.
+ Configuration Item: <literal>APT::CDROM::NoAct</literal>.
+-->
+ <listitem><para>変更なし - &sources-list; ファイルの変更や、
+ インデックスファイルの書き込みを行いません。
+ とはいえ、すべてのチェックは行います。
+ 設定項目 - <literal>APT::CDROM::NoAct</literal>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;, &apt-get;, &sources-list;
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-cdrom</command> returns zero on normal operation, decimal 100 on error.
+-->
+ <para><command>apt-cdrom</command> は正常終了時に 0 を返します。
+ エラー時には十進の 100 を返します。
+ </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+</refentry>
+
diff --git a/doc/ja/apt-config.ja.8.xml b/doc/ja/apt-config.ja.8.xml
new file mode 100644
index 000000000..b1d90f5b5
--- /dev/null
+++ b/doc/ja/apt-config.ja.8.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-config</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-config</refname>
+<!--
+ <refpurpose>APT Configuration Query program</refpurpose>
+-->
+ <refpurpose>APT 設定取得プログラム</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-config</command>
+ <arg><option>-hv</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group choice="req">
+ <arg>shell</arg>
+ <arg>dump</arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-config</command> is an internal program used by various
+ portions of the APT suite to provide consistent configurability. It accesses
+ the main configuration file <filename>/etc/apt/apt.conf</filename> in a
+ manner that is easy to use by scripted applications.</para>
+-->
+ <para><command>apt-config</command> は、
+ APT スイートの様々な所で一貫した設定を行うために使用する、内部ツールです。
+ スクリプトアプリケーションで使いやすい方法で、
+ メイン設定ファイル <filename>/etc/apt/apt.conf</filename>
+ にアクセスします。</para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is
+ given one of the commands below must be present.
+ </para>
+-->
+ <para><option>-h</option> や <option>--help</option> オプションを除き、
+ 以下に挙げるコマンドが必要です。</para>
+
+ <variablelist>
+ <varlistentry><term>shell</term>
+ <listitem><para>
+<!--
+ shell is used to access the configuration information from a shell
+ script. It is given pairs of arguments, the first being a shell
+ variable and the second the configuration value to query. As output
+ it lists a series of shell assignments commands for each present value.
+ In a shell script it should be used like:
+-->
+ shell は、シェルスクリプトから設定情報にアクセスするのに使用します。
+ 引数として、まずシェル変数、次に取得したい設定値をペアで与えます。
+ 出力として、現在の値ごとにシェル代入コマンドの一覧を表示します。
+ シェルスクリプト内では、以下のようにしてください。
+ </para>
+
+<informalexample><programlisting>
+OPTS="-f"
+RES=`apt-config shell OPTS MyApp::options`
+eval $RES
+</programlisting></informalexample>
+
+<!--
+ <para>This will set the shell environment variable $OPTS to the value of
+ MyApp::options with a default of <option>-f</option>.</para>
+-->
+ <para>これは、MyApp::options の値をシェル環境変数 $OPTS にセットします。
+ デフォルト値は <option>-f</option> となります。</para>
+
+ <!--
+ <para>The configuration item may be postfixed with a /[fdbi]. f returns
+ file names, d returns directories, b returns true or false and i returns
+ an integer. Each of the returns is normalized and verified
+ internally.</para>
+-->
+ <para>設定項目は /[fdbi] を後ろに付けられます。
+ f はファイル名を、d はディレクトリを、b は true か false を、
+ i は整数を返します。
+ 返り値ごとに内部で正規化と検証を行います。</para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>dump</term>
+ <listitem><para>
+<!--
+ Just show the contents of the configuration space.</para>
+-->
+ 設定箇所の内容を表示するだけです。</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-config</command> returns zero on normal operation, decimal 100 on error.
+-->
+ <para><command>apt-config</command> は正常終了時に 0 を返します。
+ エラー時には十進の 100 を返します。
+ </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt-extracttemplates.ja.1.xml b/doc/ja/apt-extracttemplates.ja.1.xml
new file mode 100644
index 000000000..079c89402
--- /dev/null
+++ b/doc/ja/apt-extracttemplates.ja.1.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-extracttemplates</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-extracttemplates</refname>
+<!--
+ <refpurpose>Utility to extract DebConf config and templates from Debian packages</refpurpose>
+-->
+ <refpurpose>Debian パッケージから DebConf 設定とテンプレートを抽出するユーティリティ</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-extracttemplates</command>
+ <arg><option>-hv</option></arg>
+ <arg><option>-t=<replaceable>temporary directory</replaceable></option></arg>
+ <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-extracttemplates</command> will take one or more Debian package files
+ as input and write out (to a temporary directory) all associated config
+ scripts and template files. For each passed in package that contains
+ config scripts and templates, one line of output will be generated
+ in the format:</para>
+-->
+ <para><command>apt-extracttemplates</command> は、
+ 入力に複数の Debian パッケージをとり、
+ 関連する設定スクリプトとテンプレートファイルを
+ (一時ディレクトリに) 出力します。
+ 設定スクリプト・テンプレートファイルを持つ、
+ 渡されたパッケージそれぞれに対し、以下の形式で 1 行ずつ出力します。</para>
+ <para>package version template-file config-script</para>
+<!--
+ <para>template-file and config-script are written to the temporary directory
+ specified by the -t or -\-tempdir (<literal>APT::ExtractTemplates::TempDir</literal>)
+ directory, with filenames of the form <filename>package.template.XXXX</filename> and
+ <filename>package.config.XXXX</filename></para>
+-->
+ <para>テンプレートファイルや、設定スクリプトは、
+ -t や --tempdir で指定した一時ディレクトリ
+ (<literal>APT::ExtractTemplates::TempDir</literal>) に書き出され、
+ ファイル名は、<filename>package.template.XXXX</filename> や
+ <filename>package.config.XXXX</filename> と言った形になります。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-t</option></term><term><option>--tempdir</option></term>
+<!--
+ <listitem><para>
+ Temporary directory in which to write extracted debconf template files
+ and config scripts
+ Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
+-->
+ <listitem><para>
+ 抽出した debconf テンプレートファイルや設定スクリプトを書き出す、
+ 一時ディレクトリ。
+ 設定項目 - <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+
+
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+ <para><command>apt-extracttemplates</command> は正常終了時に 0 を返します。
+ エラー時には十進の 100 を返します。</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
diff --git a/doc/ja/apt-ftparchive.ja.1.xml b/doc/ja/apt-ftparchive.ja.1.xml
new file mode 100644
index 000000000..82bd9c023
--- /dev/null
+++ b/doc/ja/apt-ftparchive.ja.1.xml
@@ -0,0 +1,1019 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-ftparchive</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-ftparchive</refname>
+<!--
+ <refpurpose>Utility to generate index files</refpurpose>
+-->
+ <refpurpose>インデックスファイル生成ユーティリティ</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-ftparchive</command>
+ <arg><option>-hvdsq</option></arg>
+ <arg><option>--md5</option></arg>
+ <arg><option>--delink</option></arg>
+ <arg><option>--readonly</option></arg>
+ <arg><option>--contents</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group choice="req">
+ <arg>packages<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
+ <arg>sources<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
+ <arg>contents <arg choice="plain"><replaceable>path</replaceable></arg></arg>
+ <arg>release <arg choice="plain"><replaceable>path</replaceable></arg></arg>
+ <arg>generate <arg choice="plain"><replaceable>config-file</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>section</replaceable></arg></arg>
+ <arg>clean <arg choice="plain"><replaceable>config-file</replaceable></arg></arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-ftparchive</command> is the command line tool that generates the index
+ files that APT uses to access a distribution source. The index files should
+ be generated on the origin site based on the content of that site.</para>
+-->
+ <para><command>apt-ftparchive</command> は、
+ APT が取得元にアクセスするのに必要な、
+ インデックスファイルを生成するコマンドラインツールです。
+ インデックスファイルは、元のサイトの内容に基づき生成されるべきです。</para>
+
+<!--
+ <para><command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; program,
+ incorporating its entire functionality via the <literal>packages</literal> command.
+ It also contains a contents file generator, <literal>contents</literal>, and an
+ elaborate means to 'script' the generation process for a complete
+ archive.</para>
+-->
+ <para><command>apt-ftparchive</command> は、
+ &dpkg-scanpackages; プログラムのスーパーセットで、
+ <literal>packages</literal> コマンド経由で機能全体を取り込んでいます。
+ また、contents ファイルジェネレータ <literal>contents</literal> と
+ 完全なアーカイブの生成プロセス「スクリプト」である綿密な手段を含んでいます。</para>
+
+<!--
+ <para>Internally <command>apt-ftparchive</command> can make use of binary databases to
+ cache the contents of a .deb file and it does not rely on any external
+ programs aside from &gzip;. When doing a full generate it automatically
+ performs file-change checks and builds the desired compressed output files.</para>
+-->
+ <para>本質的に <command>apt-ftparchive</command> は、
+ .deb ファイルの内容をキャッシュするのにバイナリデータベースを使用できます。
+ また、&gzip; 以外のいかなる外部プログラムにも依存しません。
+ すべて生成する際、</para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given one of the
+ commands below must be present.</para>
+-->
+ <para><option>-h</option> オプションや <option>--help</option> オプションを除き、
+ 以下に挙げるコマンドが必要です。</para>
+
+ <variablelist>
+ <varlistentry><term>packages</term>
+ <listitem><para>
+<!--
+ The packages command generates a package file from a directory tree. It
+ takes the given directory and recursively searches it for .deb files,
+ emitting a package record to stdout for each. This command is
+ approximately equivalent to &dpkg-scanpackages;.</para>
+-->
+ packages コマンドは、
+ ディレクトリツリーからパッケージファイルを生成します。
+ 与えられたディレクトリから再帰検索し、.deb ファイルを取得します。
+ またパッケージレコードを標準出力にそれぞれ出力します。
+ このコマンドは、&dpkg-scanpackages; とほぼ同じです。</para>
+
+<!--
+ <para>The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem>
+-->
+ <para><option>--db</option> オプションで、
+ キャッシュ DB を指定できます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>sources</term>
+ <listitem><para>
+<!--
+ The <literal>sources</literal> command generates a source index file from a directory tree.
+ It takes the given directory and recursively searches it for .dsc files,
+ emitting a source record to stdout for each. This command is approximately
+ equivalent to &dpkg-scansources;.</para>
+-->
+ <literal>sources</literal> コマンドは、
+ ディレクトリツリーからソースインデックスファイルを生成します。
+ 与えられたディレクトリから再帰検索し、.dsc ファイルを取得します。
+ またソースレコードを標準出力にそれぞれ出力します。
+ このコマンドは、&dpkg-scansources; とほぼ同じです。</para>
+ <para>
+<!--
+ If an override file is specified then a source override file will be
+ 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 ファイルを指定した場合、.
+ src 拡張子がついたソースオーバーライドファイルを探します。
+ 使用するソースオーバーライドファイルを変更するのには、
+ --source-override オプションを使用します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>contents</term>
+ <listitem><para>
+<!--
+ The <literal>contents</literal> command generates a contents file from a directory tree. It
+ takes the given directory and recursively searches it for .deb files,
+ and reads the file list from each file. It then sorts and writes to stdout
+ the list of files matched to packages. Directories are not written to
+ the output. If multiple packages own the same file then each package is
+ separated by a comma in the output.</para>
+-->
+ <literal>contents</literal> コマンドは、
+ ディレクトリツリーからコンテンツファイルを生成します。
+ 与えられたディレクトリから再帰検索し、.deb ファイルを取得します。
+ またファイルごとにファイル一覧を読み取ります。
+ その後、パッケージに対応するファイル一覧を標準出力にソートして出力します。
+ ディレクトリは出力に含まれません。
+ 複数のパッケージが同じファイルを持つ場合、
+ パッケージ名をカンマ区切りで出力します。</para>
+ <para>
+<!--
+ The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem>
+-->
+ <option>--db</option> オプションで、
+ キャッシュ DB を指定できます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>release</term>
+ <listitem><para>
+<!--
+ The <literal>release</literal> command generates a Release file from a
+ directory tree. It recursively searches the given directory for
+ Packages, Packages.gz, Packages.bz2, Sources, Sources.gz,
+ Sources.bz2, Release and md5sum.txt files. It then writes to
+ stdout a Release file containing an MD5 digest and SHA1 digest
+ for each file.</para>
+-->
+ <literal>release</literal> コマンドは、
+ ディレクトリツリーから Release ファイルを生成します。
+ 与えられたディレクトリから、Packages, Packages.gz, Packages.bz2, Sources,
+ Sources.gz, Sources.bz2, Release, md5sum.txt
+ といったファイルを再帰検索します。
+ その後、ファイルごとの MD5 ダイジェストと SHA1 ダイジェストを含んだ
+ Release ファイルを、標準出力に書き出します。</para>
+ <para>
+<!--
+ Values for the additional metadata fields in the Release file are
+ taken from the corresponding variables under
+ <literal>APT::FTPArchive::Release</literal>,
+ e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The supported fields
+ are: <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>,
+ <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>,
+ <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal>.</para></listitem>
+-->
+ Release ファイルの追加メタデータフィールドの値は、
+ <literal>APT::FTPArchive::Release</literal> 以下の相当する値
+ (例: <literal>APT::FTPArchive::Release::Origin</literal>) をとります。
+ サポートするフィールドは、
+ <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>,
+ <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>,
+ <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal> です。</para></listitem>
+
+ </varlistentry>
+
+ <varlistentry><term>generate</term>
+ <listitem><para>
+<!--
+ The <literal>generate</literal> command is designed to be runnable from a cron script and
+ builds indexes according to the given config file. The config language
+ provides a flexible means of specifying which index files are built from
+ which directories, as well as providing a simple means of maintaining the
+ required settings.</para></listitem>
+-->
+ <literal>generate</literal> コマンドは、
+ cron スクリプトから実行できるよう設計されており、
+ 与えられた設定ファイルに従ってインデックスを生成します。
+ 設定言語は、必要な設定を維持する簡単な方法を提供すると共に、
+ インデックスファイルをどのディレクトリから作成するかを指定する、
+ 柔軟な方法を提供します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>clean</term>
+ <listitem><para>
+<!--
+ The <literal>clean</literal> command tidies the databases used by the given
+ configuration file by removing any records that are no longer necessary.</para></listitem>
+-->
+ <literal>clean</literal> コマンドは、
+ 設定ファイルで与えられたデータベースを、
+ もう必要ないレコードを削除して整理します。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>The Generate Configuration</title>
+-->
+ <refsect1><title>generate 設定</title>
+ <para>
+<!--
+ The <literal>generate</literal> command uses a configuration file to describe the
+ archives that are going to be generated. It follows the typical ISC
+ configuration format as seen in ISC tools like bind 8 and dhcpd.
+ &apt-conf; contains a description of the syntax. Note that the generate
+ configuration is parsed in sectional manner, but &apt-conf; is parsed in a
+ tree manner. This only effects how the scope tag is handled.</para>
+-->
+ <literal>generate</literal> コマンドは、
+ 生成するアーカイブに関する記述をした設定ファイルを使用します。
+ 設定ファイルは、bind 8 や dhcpd といった ISC ツールに見られるような、
+ ISC 設定フォーマットに従います。
+ &apt-conf; に、文法の説明があります。
+ generate 設定はセクション法で解析しますが、
+ &apt-conf; はツリー法で解析するのに注意してください。
+ これはスコープタグの扱い方に違いがあるだけです。</para>
+
+ <para>
+<!--
+ The generate configuration has 4 separate sections, each described below.</para>
+-->
+ generate 設定には 4 個の独立したセクションがあります。
+ 以下それぞれ説明します。</para>
+
+<!--
+ <refsect2><title>Dir Section</title>
+-->
+ <refsect2><title>Dir セクション</title>
+ <para>
+<!--
+ The <literal>Dir</literal> section defines the standard directories needed to
+ locate the files required during the generation process. These
+ directories are prepended to certain relative paths defined in later
+ sections to produce a complete an absolute path.</para>
+-->
+ <literal>Dir</literal> セクションは、
+ 生成プロセスで必要なファイルを配置するための、
+ 標準ディレクトリを定義します。
+ このディレクトリは、完全な絶対パスを生成するため、
+ 後のセクションで定義される相対パスの前に結合します。</para>
+ <variablelist>
+ <varlistentry><term>ArchiveDir</term>
+ <listitem><para>
+<!--
+ Specifies the root of the FTP archive, in a standard
+ Debian configuration this is the directory that contains the
+ <filename>ls-LR</filename> and dist nodes.</para></listitem>
+-->
+ FTP アーカイブのルートを指定します。
+ 標準的な Debian 設定では、このディレクトリには
+ <filename>ls-LR</filename> と dist ノードがあります。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>OverrideDir</term>
+ <listitem><para>
+<!--
+ Specifies the location of the override files.</para></listitem>
+-->
+ オーバーライドファイルの場所を指定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>CacheDir</term>
+ <listitem><para>
+<!--
+ Specifies the location of the cache files</para></listitem>
+-->
+ キャッシュファイルの場所を指定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>FileListDir</term>
+ <listitem><para>
+<!--
+ Specifies the location of the file list files,
+ if the <literal>FileList</literal> setting is used below.</para></listitem>
+-->
+ <literal>FileList</literal> 設定が以下で使用されている場合、
+ ファイルリストファイルの場所を指定します。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+<!--
+ <refsect2><title>Default Section</title>
+-->
+ <refsect2><title>Default セクション</title>
+ <para>
+<!--
+ The <literal>Default</literal> section specifies default values, and settings
+ that control the operation of the generator. Other sections may override
+ these defaults with a per-section setting.</para>
+-->
+ <literal>Default</literal> セクションではデフォルト値を指定します。
+ また、生成器の動作を制御する設定も行います。
+ 他のセクションでは、ここにあるデフォルト値を、
+ セクションごとの設定で上書きします。</para>
+ <variablelist>
+ <varlistentry><term>Packages::Compress</term>
+ <listitem><para>
+<!--
+ Sets the default compression schemes to use
+ for the Package index files. It is a string that contains a space
+ separated list of at least one of: '.' (no compression), 'gzip' and
+ 'bzip2'. The default for all compression schemes is '. gzip'.</para></listitem>
+-->
+ Package インデックスファイルのデフォルトの圧縮方法を設定します。
+ 少なくともひとつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、
+ 空白区切りの文字列です。
+ 圧縮方法のデフォルトはすべて '. gzip' です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Packages::Extensions</term>
+ <listitem><para>
+<!--
+ Sets the default list of file extensions that are package files.
+ This defaults to '.deb'.</para></listitem>
+-->
+ パッケージファイル拡張子のデフォルト値を列挙します。
+ このデフォルト値は '.deb' です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Sources::Compress</term>
+ <listitem><para>
+<!--
+ This is similar to <literal>Packages::Compress</literal>
+ except that it controls the compression for the Sources files.</para></listitem>
+-->
+ <literal>Packages::Compress</literal> と同様に、
+ Sources ファイルの圧縮方法を指定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Sources::Extensions</term>
+ <listitem><para>
+<!--
+ Sets the default list of file extensions that are source files.
+ This defaults to '.dsc'.</para></listitem>
+-->
+ ソースファイル拡張子のデフォルト値を列挙します。
+ このデフォルト値は '.dsc' です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Contents::Compress</term>
+ <listitem><para>
+<!--
+ This is similar to <literal>Packages::Compress</literal>
+ except that it controls the compression for the Contents files.</para></listitem>
+-->
+ <literal>Packages::Compress</literal> と同様に、
+ Contents ファイルの圧縮方法を指定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>DeLinkLimit</term>
+ <listitem><para>
+<!--
+ Specifies the number of kilobytes to delink (and
+ replace with hard links) per run. This is used in conjunction with the
+ per-section <literal>External-Links</literal> setting.</para></listitem>
+-->
+ 実行するごとに delink (及びハードリンクの置き換え) する量を、
+ キロバイト単位で指定します。セクションごとの
+ <literal>External-Links</literal> 設定と合わせて使います。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>FileMode</term>
+ <listitem><para>
+<!--
+ Specifies the mode of all created index files. It
+ defaults to 0644. All index files are set to this mode with no regard
+ to the umask.</para></listitem>
+-->
+ 作成したインデックスファイルのモードを指定します。
+ デフォルトは 0644 です。全インデックスファイルは、
+ umask を無視してこのモードを使用します。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+<!--
+ <refsect2><title>TreeDefault Section</title>
+-->
+ <refsect2><title>TreeDefault セクション</title>
+ <para>
+<!--
+ Sets defaults specific to <literal>Tree</literal> sections. All of these
+ variables are substitution variables and have the strings $(DIST),
+ $(SECTION) and $(ARCH) replaced with their respective values.</para>
+-->
+ 特定の <literal>Tree</literal> セクションのデフォルトを設定します。
+ これらの変数はすべて置換変数であり、
+ 文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値に展開します。</para>
+
+ <variablelist>
+ <varlistentry><term>MaxContentsChange</term>
+ <listitem><para>
+<!--
+ Sets the number of kilobytes of contents
+ files that are generated each day. The contents files are round-robined
+ so that over several days they will all be rebuilt.</para></listitem>
+-->
+ 日毎に生成する contents ファイルをキロバイト単位で設定します。
+ contents ファイルをラウンドロビンし、数日経つとすべて再生成します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ContentsAge</term>
+ <listitem><para>
+<!--
+ Controls the number of days a contents file is allowed
+ to be checked without changing. If this limit is passed the mtime of the
+ contents file is updated. This case can occur if the package file is
+ changed in such a way that does not result in a new contents file
+ [override edit for instance]. A hold off is allowed in hopes that new
+ .debs will be installed, requiring a new file anyhow. The default is 10,
+ the units are in days.</para></listitem>
+-->
+ 変更がない contents ファイルをチェックする日数を指定します。
+ この制限を越えた contents ファイルの mtime を、更新します。
+ パッケージファイルが変更されても、
+ [例えば上書き編集で] contents ファイルが更新されないような場合、
+ こういったことが発生します。
+ 新しい .deb ファイルをインストールしたい場合、保留を解除でき、
+ 少なくとも新しいファイルが必要です。
+ デフォルトは 10 で、単位は日です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Directory</term>
+ <listitem><para>
+<!--
+ Sets the top of the .deb directory tree. Defaults to
+ <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename></para></listitem>
+-->
+ .deb ディレクトリツリーの先頭を設定します。デフォルトは
+ <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename> です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcDirectory</term>
+ <listitem><para>
+<!--
+ Sets the top of the source package directory tree. Defaults to
+ <filename>$(DIST)/$(SECTION)/source/</filename></para></listitem>
+-->
+ ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは
+ <filename>$(DIST)/$(SECTION)/source/</filename> です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Packages</term>
+ <listitem><para>
+<!--
+ Sets the output Packages file. Defaults to
+ <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename></para></listitem>
+-->
+ Packages ファイルの出力先を設定します。デフォルトは
+ <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename> です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Sources</term>
+ <listitem><para>
+<!--
+ Sets the output Packages file. Defaults to
+ <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem>
+-->
+ Packages ファイルの出力先を設定します。デフォルトは
+ <filename>$(DIST)/$(SECTION)/source/Sources</filename> です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>InternalPrefix</term>
+ <listitem><para>
+<!--
+ Sets the path prefix that causes a symlink to be
+ considered an internal link instead of an external link. Defaults to
+ <filename>$(DIST)/$(SECTION)/</filename></para></listitem>
+-->
+ 外部リンクではなく、内部リンクと見なす判断材料となる、
+ パスのプレフィックスを設定します。デフォルトは、
+ <filename>$(DIST)/$(SECTION)/</filename> です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Contents</term>
+ <listitem><para>
+<!--
+ Sets the output Contents file. Defaults to
+ <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple
+ Packages files to map onto a single Contents file (such as the default)
+ then <command>apt-ftparchive</command> will integrate those package files
+ together automatically.</para></listitem>
+-->
+ Contents ファイルの出力先を設定します。デフォルトは、
+ <filename>$(DIST)/Contents-$(ARCH)</filename> です。
+ 複数の Packages ファイルを ひとつの Contents ファイルにまとめられる設定
+ (デフォルト) の場合、<command>apt-ftparchive</command>
+ は自動でパッケージファイルをまとめます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Contents::Header</term>
+ <listitem><para>
+<!--
+ Sets header file to prepend to the contents output.</para></listitem>
+-->
+ contents の出力に付けるヘッダファイルを設定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>BinCacheDB</term>
+ <listitem><para>
+<!--
+ Sets the binary cache database to use for this
+ section. Multiple sections can share the same database.</para></listitem>
+-->
+ このセクションで使用するバイナリキャッシュデータベースを設定します。
+ 複数のセクションで同じデータベースを共有できます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>FileList</term>
+ <listitem><para>
+<!--
+ Specifies that instead of walking the directory tree,
+ <command>apt-ftparchive</command> should read the list of files from the given
+ file. Relative files names are prefixed with the archive directory.</para></listitem>
+-->
+ ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command>
+ が読み込むファイル一覧ファイルを指定します。
+ 相対ファイル名は、アーカイブディレクトリが先頭につきます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SourceFileList</term>
+ <listitem><para>
+<!--
+ Specifies that instead of walking the directory tree,
+ <command>apt-ftparchive</command> should read the list of files from the given
+ file. Relative files names are prefixed with the archive directory.
+ This is used when processing source indexs.</para></listitem>
+-->
+ ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command>
+ が読み込むファイル一覧ファイルを指定します。
+ 相対ファイル名は、アーカイブディレクトリが先頭につきます。
+ ソースインデックスを処理する際に使用します。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+<!--
+ <refsect2><title>Tree Section</title>
+-->
+ <refsect2><title>Tree セクション</title>
+ <para>
+<!--
+ The <literal>Tree</literal> section defines a standard Debian file tree which
+ consists of a base directory, then multiple sections in that base
+ directory and finally multiple Architectures in each section. The exact
+ pathing used is defined by the <literal>Directory</literal> substitution variable.</para>
+-->
+ <literal>Tree</literal> セクションでは、
+ ベースディレクトリからの標準 Debian ファイルツリー、
+ ベースディレクトリの複数のセクション、
+ 最終的にはセクションごとの複数のアーキテクチャを定義します。
+ 使用する正確なパスは、<literal>Directory</literal> 変数で定義されます。</para>
+ <para>
+<!--
+ The <literal>Tree</literal> section takes a scope tag which sets the
+ <literal>$(DIST)</literal> variable and defines the root of the tree
+ (the path is prefixed by <literal>ArchiveDir</literal>).
+ Typically this is a setting such as <filename>dists/woody</filename>.</para>
+-->
+ <literal>Tree</literal> セクションは、
+ <literal>$(DIST)</literal> 変数で設定されているスコープタグをとり、
+ ツリーのルート (<literal>ArchiveDir</literal>が先頭につくパス)
+ を定義します。
+ 通常、この設定は <filename>dists/woody</filename> のようになります。</para>
+ <para>
+<!--
+ All of the settings defined in the <literal>TreeDefault</literal> section can be
+ use in a <literal>Tree</literal> section as well as three new variables.</para>
+-->
+ <literal>TreeDefault</literal> セクションで定義される設定はすべて、
+ 3 個の新しい変数と同様に、
+ <literal>Tree</literal> セクションで使用できます。</para>
+ <para>
+<!--
+ When processing a <literal>Tree</literal> section <command>apt-ftparchive</command>
+ performs an operation similar to:
+-->
+ <literal>Tree</literal> セクションを処理する際、
+ <command>apt-ftparchive</command> は以下のような操作を行います。
+<informalexample><programlisting>
+for i in Sections do
+ for j in Architectures do
+ Generate for DIST=scope SECTION=i ARCH=j
+</programlisting></informalexample></para>
+
+ <variablelist>
+ <varlistentry><term>Sections</term>
+ <listitem><para>
+<!--
+ This is a space separated list of sections which appear
+ under the distribution, typically this is something like
+ <literal>main contrib non-free</literal></para></listitem>
+-->
+ distribution 以下に現れるセクションを、空白区切りで指定したリストです。
+ 通常、<literal>main contrib non-free</literal>のようになります。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Architectures</term>
+ <listitem><para>
+<!--
+ This is a space separated list of all the
+ architectures that appear under search section. The special architecture
+ 'source' is used to indicate that this tree has a source archive.</para></listitem>
+-->
+ search セクション以下に現れるアーキテクチャを、
+ 空白区切りで指定したリストです。
+ 特殊アーキテクチャ 'source' は、
+ ソースアーカイブのツリーであることを示します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>BinOverride</term>
+ <listitem><para>
+<!--
+ Sets the binary override file. The override file
+ contains section, priority and maintainer address information.</para></listitem>
+-->
+ バイナリオーバーライドファイルを設定します。
+ このオーバーライドファイルには、セクション、優先度、
+ メンテナのアドレスといった情報が含まれています。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcOverride</term>
+ <listitem><para>
+<!--
+ Sets the source override file. The override file
+ contains section information.</para></listitem>
+-->
+ ソースオーバーライドファイルを設定します。
+ このオーバーライドファイルには、
+ セクションの情報が含まれています。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ExtraOverride</term>
+ <listitem><para>
+<!--
+ Sets the binary extra override file.</para></listitem>
+-->
+ バイナリ特別オーバーライドファイルを設定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcExtraOverride</term>
+ <listitem><para>
+<!--
+ Sets the source extra override file.</para></listitem>
+-->
+ ソース特別オーバーライドファイルを設定します。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+
+<!--
+ <refsect2><title>BinDirectory Section</title>
+-->
+ <refsect2><title>BinDirectory セクション</title>
+ <para>
+<!--
+ The <literal>bindirectory</literal> section defines a binary directory tree
+ with no special structure. The scope tag specifies the location of
+ the binary directory and the settings are similar to the <literal>Tree</literal>
+ section with no substitution variables or
+ <literal>Section</literal><literal>Architecture</literal> settings.</para>
+-->
+ <literal>bindirectory</literal> セクションでは、
+ 特殊な構造を持たないバイナリディレクトリツリーを定義します。
+ スコープタグはバイナリディレクトリの場所を指定し、
+ 設定は、変数展開のない <literal>Tree</literal> セクションや
+ <literal>Section</literal><literal>Architecture</literal> 設定に似ています。</para>
+ <variablelist>
+ <varlistentry><term>Packages</term>
+ <listitem><para>
+<!--
+ Sets the Packages file output.</para></listitem>
+-->
+ Packages ファイルの出力先を設定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcPackages</term>
+ <listitem><para>
+<!--
+ Sets the Sources file output. At least one of
+ <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem>
+-->
+ Sources ファイルの出力先を設定します。
+ 少なくとも <literal>Packages</literal> や <literal>SrcPackages</literal>
+ は設定されていなければなりません。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Contents</term>
+ <listitem><para>
+<!--
+ Sets the Contents file output. (optional)</para></listitem>
+-->
+ Contents ファイルの出力先を設定します。(オプション)</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>BinOverride</term>
+ <listitem><para>
+<!--
+ Sets the binary override file.</para></listitem>
+-->
+ バイナリオーバーライドファイルを設定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcOverride</term>
+ <listitem><para>
+<!--
+ Sets the source override file.</para></listitem>
+-->
+ ソースオーバーライドファイルを設定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ExtraOverride</term>
+ <listitem><para>
+<!--
+ Sets the binary extra override file.</para></listitem>
+-->
+ バイナリ特別オーバーライドファイルを設定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>SrcExtraOverride</term>
+ <listitem><para>
+<!--
+ Sets the source extra override file.</para></listitem>
+-->
+ ソース特別オーバーライドファイルを設定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>BinCacheDB</term>
+ <listitem><para>
+<!--
+ Sets the cache DB.</para></listitem>
+-->
+ キャッシュ DB を設定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>PathPrefix</term>
+ <listitem><para>
+<!--
+ Appends a path to all the output paths.</para></listitem>
+-->
+ 全出力パスに付加するパス。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>FileList, SourceFileList</term>
+ <listitem><para>
+<!--
+ Specifies the file list file.</para></listitem>
+-->
+ ファイル一覧ファイルを指定します。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
+ </refsect1>
+
+
+<!--
+ <refsect1><title>The Binary Override File</title>
+-->
+ <refsect1><title>バイナリオーバーライドファイル</title>
+<!--
+ <para>The binary override file is fully compatible with &dpkg-scanpackages;. It
+ contains 4 fields separated by spaces. The first field is the package name,
+ the second is the priority to force that package to, the third is the
+ the section to force that package to and the final field is the maintainer
+ permutation field.</para>
+-->
+ <para>バイナリオーバーライドファイルは、
+ &dpkg-scanpackages; と完全に互換性があります。
+ ここには、空白区切りでフィールドが 4 個あります。
+ 先頭のフィールドはパッケージ名、
+ 2 番目のフィールドはパッケージに強制する優先度、
+ 3 番目のフィールドはパッケージに強制するセクション、
+ 最後のフィールドはメンテナ順列フィールドです。</para>
+<!--
+ <para>The general form of the maintainer field is:
+ <literallayout>old [// oldn]* => new</literallayout>
+ or simply,
+ <literallayout>new</literallayout>
+ The first form allows a double-slash separated list of old email addresses
+ to be specified. If any of those are found then new is substituted for the
+ maintainer field. The second form unconditionally substitutes the
+ maintainer field.</para>
+-->
+ <para>メンテナフィールドは一般的には、
+ <literallayout>old [// oldn]* => new</literallayout>
+ という形式か、単純に
+ <literallayout>new</literallayout>
+ となります。
+ 最初の形式は、// で区切られた古いemail アドレスのリストを許可します。
+ この形式がある場合は、メンテナフィールドになるよう new に置換してください。
+ 2 番目の形式は無条件にメンテナフィールドに置換します。</para>
+ </refsect1>
+
+
+<!--
+ <refsect1><title>The Source Override File</title>
+-->
+ <refsect1><title>ソースオーバーライドファイル</title>
+ <para>
+<!--
+ The source override file is fully compatible with &dpkg-scansources;. It
+ contains 2 fields separated by spaces. The first fields is the source
+ package name, the second is the section to assign it.</para>
+-->
+ ソースオーバーライドファイルは、
+ &dpkg-scansources; と完全に互換性があります。
+ ここには、空白区切りでフィールドが 2 個あります。
+ 先頭のフィールドはソースパッケージ名、
+ 2 番目のフィールドは割り当てるセクションです。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>The Extra Override File</title>
+-->
+ <refsect1><title>特別オーバーライドファイル</title>
+ <para>
+<!--
+ The extra override file allows any arbitrary tag to be added or replaced
+ in the output. It has 3 columns, the first is the package, the second is
+ the tag and the remainder of the line is the new value.</para>
+-->
+ 特別オーバーライドファイルは、
+ 出力中に任意のタグを追加・置換できるようにします。
+ 3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>--md5</option></term>
+ <listitem><para>
+<!--
+ Generate MD5 sums. This defaults to on, when turned off the generated
+ index files will not have MD5Sum fields where possible.
+ Configuration Item: <literal>APT::FTPArchive::MD5</literal></para></listitem>
+-->
+ MD5 sum を生成します。デフォルトで on になっており、
+ off にすると生成したインデックスファイルに MD5Sum フィールドがありません。
+ 設定項目 - <literal>APT::FTPArchive::MD5</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-d</option></term><term><option>--db</option></term>
+ <listitem><para>
+<!--
+ Use a binary caching DB. This has no effect on the generate command.
+ Configuration Item: <literal>APT::FTPArchive::DB</literal>.</para></listitem>
+-->
+ バイナリキャッシュ DB を使用します。
+ generate コマンドには影響しません。
+ 設定項目 - <literal>APT::FTPArchive::DB</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+ <listitem><para>
+<!--
+ Quiet; produces output suitable for logging, omitting progress indicators.
+ More q's will produce more quiet up to a maximum of 2. You can also use
+ <option>-q=#</option> to set the quiet level, overriding the configuration file.
+ Configuration Item: <literal>quiet</literal>.</para></listitem>
+-->
+ 静粛 - 進捗表示を省略し、ログをとるのに便利な出力を行います。
+ 最大 2 つまで q を重ねることでより静粛にできます。
+ また、<option>-q=#</option> のように静粛レベルを指定して、
+ 設定ファイルを上書きすることもできます。
+ 設定項目 - <literal>quiet</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--delink</option></term>
+ <listitem><para>
+<!--
+ Perform Delinking. If the <literal>External-Links</literal> setting is used then
+ this option actually enables delinking of the files. It defaults to on and
+ can be turned off with <option>-\-no-delink</option>.
+ Configuration Item: <literal>APT::FTPArchive::DeLinkAct</literal>.</para></listitem>
+-->
+ Delink を実行します。
+ <literal>External-Links</literal> 設定を使用している場合、
+ このオプションはファイルの delink を有効にします。
+ デフォルトは on で、
+ off にするには <option>--no-delink</option> としてください。
+ 設定項目 - <literal>APT::FTPArchive::DeLinkAct</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--contents</option></term>
+ <listitem><para>
+<!--
+ Perform contents generation. When this option is set and package indexes
+ are being generated with a cache DB then the file listing will also be
+ extracted and stored in the DB for later use. When using the generate
+ command this option also allows the creation of any Contents files. The
+ default is on.
+ Configuration Item: <literal>APT::FTPArchive::Contents</literal>.</para></listitem>
+-->
+ contents の生成を行います。このオプションを指定し、
+ パッケージインデックスをキャッシュ DB と共に生成する際、
+ ファイルリストを後で使用するように、抽出し DB に格納します。
+ generate コマンドを使用する際、
+ このオプションでいずれの Contents ファイルも作成できます。
+ デフォルトは on です。
+ 設定項目 - <literal>APT::FTPArchive::Contents</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-s</option></term><term><option>--source-override</option></term>
+ <listitem><para>
+<!--
+ Select the source override file to use with the <literal>sources</literal> command.
+ Configuration Item: <literal>APT::FTPArchive::SourceOverride</literal>.</para></listitem>
+-->
+ <literal>sources</literal> コマンドで使用する、
+ ソースオーバーライドファイルを選択します。
+ 設定項目 - <literal>APT::FTPArchive::SourceOverride</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--readonly</option></term>
+ <listitem><para>
+<!--
+ Make the caching databases read only.
+ Configuration Item: <literal>APT::FTPArchive::ReadOnlyDB</literal>.</para></listitem>
+-->
+ キャッシュデータベースを読み取り専用にします。
+ 設定項目 - <literal>APT::FTPArchive::ReadOnlyDB</literal></para></listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+<refsect1><title>Examples</title>
+-->
+<refsect1><title>サンプル</title>
+
+<!--
+<para>To create a compressed Packages file for a directory containing
+binary packages (.deb):
+-->
+<para>バイナリパッケージ (.deb) があるディレクトリの
+Packages ファイルを生成するには、以下のようにします。
+
+<programlisting>
+<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>
+</programlisting></para>
+
+</refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-ftparchive</command> returns zero on normal operation, decimal 100 on error.</para>
+-->
+ <para><command>apt-ftparchive</command> は正常終了時に 0 を返します。
+ エラー時には十進の 100 を返します。</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
diff --git a/doc/ja/apt-get.ja.8.sgml b/doc/ja/apt-get.ja.8.sgml
deleted file mode 100644
index 156f83699..000000000
--- a/doc/ja/apt-get.ja.8.sgml
+++ /dev/null
@@ -1,857 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.12 -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
-
- <refmeta>
- <refentrytitle>apt-get</>
- <manvolnum>8</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
- <refname>apt-get</>
-<!--
- <refpurpose>APT package handling utility - - command-line interface</>
--->
- <refpurpose>APT ѥå桼ƥƥ -- ޥɥ饤󥤥󥿡ե</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>apt-get</>
- <arg><option>-hvs</></arg>
- <arg><option>-o=<replaceable/config string/</></arg>
- <arg><option>-c=<replaceable/file/</></arg>
- <group choice=req>
- <arg>update</>
- <arg>upgrade</>
- <arg>dselect-upgrade</>
- <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
- <arg>check</>
- <arg>clean</>
- <arg>autoclean</>
- </group>
- </cmdsynopsis>
- </refsynopsisdiv>
-
-<!--
- <RefSect1><Title>Description</>
--->
- <RefSect1><Title></>
- <para>
-<!--
- <command/apt-get/ is the command-line tool for handling packages, and may be
- considered the user's "back-end" to other tools using the APT library.
--->
- <command/apt-get/ ϥѥå륳ޥɥ饤ġǡ
- APT 饤֥Ѥ¾ΥġΥ桼¦ХåɤȤ⤤ΤǤ
- </para>
- <para>
-<!--
- Unless the <option/-h/, or <option/- -help/ option is given one of the
- commands below must be present.
--->
- <option/-h/ <option/--help/ ʲ˵󤲤륳ޥɤɬפǤ
- </para>
- <VariableList>
- <VarListEntry><Term>update</Term>
- <ListItem><Para>
-<!--
- <literal/update/ is used to resynchronize the package index files from
- their sources. The indexes of available packages are fetched from the
- location(s) specified in <filename>/etc/apt/sources.list</>.
- For example, when using a Debian archive, this command retrieves and
- scans the <filename>Packages.gz</> files, so that information about new
- and updated packages is available. An <literal/update/ should always be
- performed before an <literal/upgrade/ or <literal/dist-upgrade/. Please
- be aware that the overall progress meter will be incorrect as the size
- of the package files cannot be known in advance.
--->
- <literal/update/ Ϥ줾ѥåǥåե
- ƱԤΤ˻ѤޤѲǽʥѥåΥǥå
- <filename>/etc/apt/sources.list</> ˵Ҥ꤫ޤ
- 㤨 Debian archive ѤݡΥޥɤ <filename>Packages.gz</>
- ե򸡺뤳ȤǡޤϹ줿ѥåξѲǽ
- Ȥʤޤ<literal/update/ <literal/upgrade/
- <literal/dist-upgrade/ Ԥ˾˼¹Ԥ٤Ǥ
- äƥѥåեΥΤ뤳ȤǤʤᡢ
- ΤΥץ쥹᡼ɽޤ
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>upgrade</Term>
- <ListItem><Para>
-<!--
- <literal/upgrade/ is used to install the newest versions of all packages
- currently installed on the system from the sources enumerated in
- <filename>/etc/apt/sources.list</>. Packages currently installed with
- new versions available are retrieved and upgraded; under no circumstances
- are currently installed packages removed, or packages not already installed
- retrieved and installed. New versions of currently installed packages that
- cannot be upgraded without changing the install status of another package
- will be left at their current version. An <literal/update/ must be
- performed first so that <command/apt-get/ knows that new versions of packages are
- available.
--->
- <literal/upgrade/ ϡߥƥ˥󥹥ȡ뤵Ƥѥå
- ǿС<filename>/etc/apt/sources.list</> 󤷤
- 󥹥ȡ뤹Τ˻Ѥޤߥ󥹥ȡΥѥå˿
- С󤬤йޤʤ⸽ߥ󥹥ȡ
- ѥåκϹԤޤоݤΥѥå
- ¾ΥѥåΥ󥹥ȡ֤ѹ˹Ǥʤϡ
- ߤΥСΤޤޤȤʤޤ
- <literal/update/ Ϥ˼¹ԤƤơ<command/apt-get/
- ѥåοСѤǤ뤳ȤΤ餻ɬפޤ
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>dselect-upgrade</Term>
- <ListItem><Para>
-<!--
- is used in conjunction with the traditional Debian GNU/Linux packaging
- front-end, &dselect;. <literal/dselect-upgrade/
- follows the changes made by &dselect; to the <literal/Status/
- field of available packages, and performs the actions necessary to realize
- that state (for instance, the removal of old and the installation of new
- packages).
--->
- Ū Debian GNU/Linux ѥåեȥɤ &dselect;
- ȶ˻Ѥޤ<literal/dselect-upgrade/ &dselect; Ǻ줿
- Ѳǽѥå <literal/Status/ եɤѹפ
- ξ֤ȿǤΤɬפʥ¹Ԥޤ
- (㤨СŤѥåκ俷ѥåΥ󥹥ȡʤ)
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>dist-upgrade</Term>
- <ListItem><Para>
-<!--
- <literal/dist-upgrade/, in addition to performing the function of
- <literal/upgrade/, also intelligently handles changing dependencies
- with new versions of packages; <command/apt-get/ has a "smart" conflict
- resolution system, and it will attempt to upgrade the most important
- packages at the expense of less important ones if necessary.
- The <filename>/etc/apt/sources.list</> file contains a list of locations
- from which to retrieve desired package files.
--->
- <literal/dist-upgrade/ <literal/upgrade/ εǽ˲äС
- ѥåФ¸طѹŪޤ
- <command/apt-get/ ϡ줿׶襷ƥɬפʤ
- ŪפǤʤѥåˤơǽץѥåι
- ߤޤ
- <filename>/etc/apt/sources.list</> եɬפʥѥåե
- ΥꥹȤޤޤƤޤ
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>install</Term>
- <ListItem><Para>
-<!--
- <literal/install/ is followed by one or more packages desired for
- installation. Each package is a package name, not a fully qualified
- filename (for instance, in a Debian GNU/Linux system, libc6 would be the
- argument provided, not em(libc6_1.9.6-2.deb)). All packages required
- by the package(s) specified for installation will also be retrieved and
- installed. The <filename>/etc/apt/sources.list</> file is used to locate
- the desired packages. If a hyphen is appended to the package name (with
- no intervening space), the identified package will be removed if it is
- installed. Similarly a plus sign can be used to designate a package to
- install. These latter features may be used to override decisions made by
- apt-get's conflict resolution system.
--->
- <literal/install/ θˤϥ󥹥ȡ뤹ѥå1İʾꤷޤ
- ꤹѥåϡʥե̾ǤϤʤѥå̾Ǥ
- (㤨 Debian GNU/Linux ƥǤ libc6_1.9.6-2.deb ǤϤʤ libc6
- ȤͿޤ) 󥹥ȡ뤹褦ꤷ٤ƤΥѥåФ
- 󥹥ȡԤޤ<filename>/etc/apt/sources.list</> ե
- ׵᤹ѥåξꤹΤ˻Ѥޤ
- ѥå̾θ (ޤޤ) ϥեɲäƤ硢
- Υѥå󥹥ȡ뤵Ƥкޤ
- Ʊͤˡ󥹥ȡ뤹ѥåΤ˥ץ饹ѤǤޤ
- ʸ apt-get ζ襷ƥȽǤѤ뤫⤷ޤ
- </para>
- <para>
-<!--
- A specific version of a package can be selected for installation by
- following the package name with an equals and the version of the package
- to select. This will cause that version to be located and selected for
- install. Alternatively a specific distribution can be selected by
- following the package name with a slash and the version of the
- distribution or the Archive name (stable, frozen, unstable).
--->
- ѥå˥뵭ȥС³뤳Ȥǡ
- 򤷤СΥѥå򥤥󥹥ȡ뤹뤳ȤǤޤ
- ĤޤΥСΥѥå򥤥󥹥ȡ뤹褦
- ȤȤǤ
- ̤ˡȤƤϡǥȥӥ塼ꤹΤˡ
- ѥå̾θ³ƥåȥǥȥӥ塼ΥС
- ̾ (stable, frozen, unstable) 򵭽ҤǤޤ
- </para>
- <para>
- С򵡹ϥ󥰥졼ɻˤѤǤ뤿ᡢդʧä
- ѤʤФʤޤ
- </para>
- <para>
-<!--
- If no package matches the given expression and the expression contains one
- of '.', '?' or '*' then it is assumed to be a POSIX regex and it is applied
- to all package names in the database. Any matches are then installed (or
- removed). Note that matching is done by substring so 'lo.*' matches 'how-lo'
- and 'lowest'. If this is undesired prefix with a '^' character.
--->
- ⤷'.''?''*'ޤ๽ʸ˰Ĥѥå̾ޥåʤä硢
- POSIX ɽǤȸʤǡ١ѥå̾Ф
- ŬѤޤ
- ޥåѥå٤Ƥ󥹥ȡ(⤷Ϻ)ޤ
- ) 'lo.*' Τ褦ʸ 'how-lo' 'lowest' ˥ޥåޤ
- ˾ޤʤСƬ '^' ĤƤ
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>remove</Term>
- <ListItem><Para>
-<!--
- <literal/remove/ is identical to <literal/install/ except that packages are
- removed instead of installed. If a plus sign is appended to the package
- name (with no intervening space), the identified package will be
- installed.
--->
- <literal/remove/ ѥå뤳Ȥ<literal/install/
- ƱͤǤ
- ץ饹椬ѥå̾ (֤˶ޤޤ) ղä줿硢
- ̤줿ѥå򥤥󥹥ȡ뤷ޤ
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>source</Term>
- <ListItem><Para>
-<!--
- <literal/source/ causes <command/apt-get/ to fetch source packages. APT
- will examine the available packages to decide which source package to
- fetch. It will then find and download into the current directory the
- newest available version of that source package. Source packages are
- tracked separately from binary packages via <literal/deb-src/ type lines
- in the &sources-list; file. This probably will mean that you will not
- get the same source as the package you have installed or as you could
- install. If the - -compile options is specified then the package will be
- compiled to a binary .deb using dpkg-buildpackage, if - -download-only is
- specified then the source package will not be unpacked.
--->
- <literal/source/ ϥѥå褦 <command/apt-get/
- 뤳Ȥ̣ޤ
- APT ϤɤΥѥå뤫ꤹ褦Ѳǽʥѥå
- Ƥޤ
- θ塢ǿѲǽʥѥå򸫤Ĥȥǥ쥯ȥ
- ɤޤ
- ѥåϡХʥѥåȤ̤ &sources-list; ե
- <literal/deb-src/ Ԥפޤ
- ϡ󥹥ȡ뤷 (ޤϥ󥹥ȡǤ) ѥåȡ
- Ѥ뤳ȤǤ뤳Ȥ򼨤Ƥޤ
- --compile ץ󤬻ꤵ줿硢dpkg-buildpackage Ѥ
- Хʥ .deb եإѥԤޤ
- --download-only ξϥѥåŸޤ
- </para>
- <para>
-<!--
- A specific source version can be retrieved by postfixing the source name
- with an equals and then the version to fetch, similar to the mechanism
- used for the package files. This enables exact matching of the source
- package name and version, implicitly enabling the
- <literal/APT::Get::Only-Source/ option.
--->
- ѥåƱͤˡ̾θ˥ȼС
- ֤ȤǡꤷСΥ뤳ȤǤޤ
- <literal/APT::Get::Only-Source/ ץǰۤΤͭˤʤä
- 뤿ᡢѥå̾ȥС˸̩˥ޥå󥰤褦
- ʤäƤޤ
- </para>
-
- <para>
-<!--
- Note that source packages are not tracked like binary packages, they
- exist only in the current directory and are similar to downloading source
- tar balls.
--->
- ) tar ball ϥȥǥ쥯ȥˤΤߥɤ졢
- ȥǥ쥯ȥŸޤ
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>build-dep</Term>
- <ListItem><Para>
-<!--
- <literal/build-dep/ causes apt-get to install/remove packages in an
- attempt to satisfy the build dependencies for a source packages.
--->
- <literal/build-dep/ ϥѥåι۰¸ط褦ˡ
- ѥåΥ󥹥ȡ롦Ԥޤ
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>check</Term>
- <ListItem><Para>
-<!--
- <literal/check/ is a diagnostic tool; it updates the package cache and checks
- for broken dependencies.
--->
- <literal/check/ ϡѥååι줿¸طå
- ǥġǤ
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>clean</Term>
- <ListItem><Para>
-<!--
- <literal/clean/ clears out the local repository of retrieved package
- files. It removes everything but the lock file from
- <filename>&cachedir;/archives/</> and
- <filename>&cachedir;/archive/partial/</>. When APT is used as a
- &dselect; method, <literal/clean/ is run automatically.
- Those who do not use dselect will likely want to run <literal/apt-get clean/
- from time to time to free up disk space.
- -->
- <literal/clean/ ϼѥåΥݥȥݽޤ
- <filename>&cachedir;/archives/</>
- <filename>&cachedir;/archive/partial/</>
- åեʳ٤ƺޤ
- APT &dselect; ƤФȤˤϡưŪ <literal/clean/
- ¹Ԥޤ
- dselectѤʤϡǥڡ뤿ᡢ
- <literal/apt-get clean/ ¹ԤʤǤ礦
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><Term>autoclean</Term>
- <ListItem><Para>
-<!--
- Like <literal/clean/, <literal/autoclean/ clears out the local
- repository of retrieved package files. The difference is that it only
- removes package files that can no longer be downloaded, and are largely
- useless. This allows a cache to be maintained over a long period without
- it growing out of control. The configuration option
- <literal/APT::Clean-Installed/ will prevent installed packages from being
- erased if it is set off.
--->
- <literal/clean/ Ʊ͡<literal/autoclean/ ϼѥåΥ
- ݥȥݽޤ㤤ϡ⤦ɤ뤳Ȥʤ
- ѥåե䡢ۤȤפʥѥåեΤߤ뤳ȤǤ
- ΤᡢĹ֡å夬Ǥ粽뤳Ȥʤ
- ݻ뤳ȤǤޤ
- ꥪץ <literal/APT::Clean-Installed/ off åȤƤС
- 󥹥ȡѤΥѥåե뤬ΤɤȤǤޤ
- </Para></ListItem>
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
- <RefSect1><Title>ץ</>
- &apt-cmdblurb;
-
- <VariableList>
- <VarListEntry><term><option/-d/</><term><option/--download-only/</>
- <ListItem><Para>
-<!--
- Download only; package files are only retrieved, not unpacked or installed.
- Configuration Item: <literal/APT::Get::Download-Only/.
--->
- ɤΤ - ѥåեμΤߤԤ
- Ÿ󥹥ȡԤޤ
- - <literal/APT::Get::Download-Only/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-f/</><term><option/--fix-broken/</>
- <ListItem><Para>
-<!--
- Fix; attempt to correct a system with broken dependencies in
- place. This option, when used with install/remove, can omit any packages
- to permit APT to deduce a likely soltion. Any Package that are specified
- must completly correct the problem. The option is sometimes necessary when
- running APT for the first time; APT itself does not allow broken package
- dependencies to exist on a system. It is possible that a system's
- dependency structure can be so corrupt as to require manual intervention
- (which usually means using &dselect; or <command/dpkg - -remove/ to eliminate some of
- the offending packages). Use of this option together with <option/-m/ may produce an
- error in some situations.
- Configuration Item: <literal/APT::Get::Fix-Broken/.
--->
- - ¸ط줿ƥνߤޤ
- Υץ install remove Ȱ˻ȤȤϡѥå
- ꤷʤƤ⤫ޤޤ󡣤ɤΥѥåꤷƤ⡢
- 褷ޤ
- APT Τϥƥ¸ߤ줿ѥå¸طȤǤʤ
- Τǡ APT ¹Ԥ硢Υץɬפˤʤ뤳Ȥޤ
- ƥΰ¸ط¤ˤʤ꤬ϡưǽ褦
- ׵᤹뤳Ȥޤ
- (̾ϡΤѥåΤ&dselect;
- <command/dpkg --remove/ Ѥޤ)
- Υץ <option/-m/ ץƱ˻Ѥȡ
- Ǥϥ顼ˤʤ뤫⤷ޤ
- - <literal/APT::Get::Fix-Broken/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-m/</><term><option/--ignore-missing/</>
- <term><option/--fix-missing/</>
- <ListItem><Para>
-<!--
- Ignore missing packages; If packages cannot be retrieved or fail the
- integrity check after retrieval (corrupted package files), hold back
- those packages and handle the result. Use of this option together with
- <option/-f/ may produce an error in some situations. If a package is
- selected for installation (particularly if it is mentioned on the
- command line) and it could not be downloaded then it will be silently
- held back.
- Configuration Item: <literal/APT::Get::Fix-Missing/.
--->
- ѥå̵ - ѥåǤʤäꡢ
- (ѥå») å̤ʤä硢
- ΥѥåναǸޤǽ³ޤ
- Υץ <option/-f/ ץƱ˻Ѥȡ
- Ǥϥ顼ˤʤ뤫⤷ޤ
- ѥå򥤥󥹥ȡ뤹褦򤷤Ƥ
- (ä˥ޥɥ饤Ǥ) 䡢ɤǤʤä
- ʤˤɽα뤳Ȥˤʤޤ
- - <literal/APT::Get::Fix-Missing/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--no-download/</>
- <ListItem><Para>
-<!--
- Disables downloading of packages. This is best used with
- <option/- -ignore-missing/ to force APT to use only the .debs it has
- already downloaded.
- Configuration Item: <literal/APT::Get::Download/.
--->
- ѥåΥɤ򤵤ޤ󡣤ϤǤ˥ɤ .deb
- ФƤΤAPTԤݤˡ<option/--ignore-missing/ ʻ
- ȤΤ褤Ǥ礦
- - <literal/APT::Get::Download/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-q/</><term><option/--quiet/</>
- <ListItem><Para>
-<!--
- Quiet; produces output suitable for logging, omitting progress indicators.
- More q's will produce more quiet up to a maximum of 2. You can also use
- <option/-q=#/ to set the quiet level, overriding the configuration file.
- Note that quiet level 2 implies <option/-y/, you should never use -qq
- without a no-action modifier such as -d, - -print-uris or -s as APT may
- decided to do something you did not expect.
- Configuration Item: <literal/quiet/.
--->
- Ų - ĽɽάƥȤΤʽϤԤޤ
- 2 Ĥޤ q Ťͤ뤳ȤǤŤˤǤޤ
- ޤ<option/-q=#/ Τ褦Ų٥ꤷơե
- 񤭤뤳ȤǤޤ
- ) Ų٥ 2 <option/-y/ ΰ̣ޤǤޤ
- APT տޤʤԤ⤷ʤΤ -d, --print-uris, -s Τ褦
- ԤʤץĤ -qq Ѥ٤ǤϤޤ
- - <literal/quiet/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-s/</>
- <term><option/--simulate/</>
- <term><option/--just-print/</>
- <term><option/--dry-run/</>
- <term><option/--recon/</>
- <term><option/--no-act/</>
- <ListItem><Para>
-<!--
- No action; perform a simulation of events that would occur but do not
- actually change the system.
- Configuration Item: <literal/APT::Get::Simulate/.
--->
- ưʤ - ʤˤΤΥߥ졼Ԥ
- ºݤΥƥѹϤޤ
- - <literal/APT::Get::Simulate/
- </para>
- <para>
-<!--
- Simulate prints out
- a series of lines each one representing a dpkg operation, Configure (Conf),
- Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
- and empty set of square brackets meaning breaks that are of no consequence
- (rare).
--->
- ߥ졼Ȥη̡dpkg ưɽϢιԤΤ줾ˡ (Conf)
- (Remv) Ÿ (Inst) ɽޤ
- ѥåϲ줿ѥåɽγѥå礷ǤϤʤȤ
- ɽޤ(ޤǤ)
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-y/</><term><option/--yes/</>
- <term><option/--assume-yes/</>
- <ListItem><Para>
-<!--
- Automatic yes to prompts; assume "yes" as answer to all prompts and run
- non-interactively. If an undesirable situation, such as changing a held
- package or removing an essential package occurs then <literal/apt-get/
- will abort.
- Configuration Item: <literal/APT::Get::Assume-Yes/.
--->
- ץץȤؤμư - ٤ƤΥץץȤ˼ưŪ "yes"
- Ū˼¹Ԥޤ
- αѥåξ֤ѹꡢɬܥѥå褦Ŭڤʾξ硢
- <literal/apt-get/ ǤǤ礦
- - <literal/APT::Get::Assume-Yes/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-u/</><term><option/--show-upgraded/</>
- <ListItem><Para>
-<!--
- Show upgraded packages; Print out a list of all packages that are to be
- upgraded.
- Configuration Item: <literal/APT::Get::Show-Upgraded/.
--->
- ѥåɽ - ѥåΰɽޤ
- - <literal/APT::Get::Show-Upgraded/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-b/</><term><option/--compile/</>
- <term><option/--build/</>
- <ListItem><Para>
-<!--
- Compile source packages after downloading them.
- Configuration Item: <literal/APT::Get::Compile/.
--->
- ѥåɸ塢ѥ뤷ޤ
- - <literal/APT::Get::Compile/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--ignore-hold/</>
- <ListItem><Para>
-<!--
- Ignore package Holds; This causes <command/apt-get/ to ignore a hold
- placed on a package. This may be useful in conjunction with
- <literal/dist-upgrade/ to override a large number of undesired holds.
- Configuration Item: <literal/APT::Ignore-Hold/.
--->
- αѥå̵ - ѥåαؼ̵뤷 <command/apt-get/
- Ԥޤ
- ̤Υѥåαβ򤹤Τ <literal/dist-upgrade/ ȶ
- ѤǤ
- - <literal/APT::Ignore-Hold/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--no-upgrade/</>
- <ListItem><Para>
-<!--
- Do not upgrade packages; When used in conjunction with <literal/install/
- <literal/no-upgrade/ will prevent packages listed from being upgraded
- if they are already installed.
- Configuration Item: <literal/APT::Get::Upgrade/.
--->
- ѥåʤ - <literal/install/ Ʊ˻Ѥȡ
- <literal/no-upgrade/ ϻꤷѥåǤ˥󥹥ȡ뤷Ƥ
- Ԥޤ
- - <literal/APT::Get::Upgrade/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--force-yes/</>
- <ListItem><Para>
-<!--
- Force yes; This is a dangerous option that will cause apt to continue
- without prompting if it is doing something potentially harmful. It
- should not be used except in very special situations. Using
- <literal/force-yes/ can potentially destroy your system!
- Configuration Item: <literal/APT::Get::force-yes/.
--->
- - APT »Ϳͤʤư򤷤褦ȤǤ⡢
- ǧϤʤǼ¹ԤƤޤʥץǤ
- ۤɤξǤʤСѤʤǤ礦
- <literal/force-yes/ ϤʤΥƥ˲ͤޤ!
- - <literal/APT::Get::force-yes/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--print-uris/</>
- <ListItem><Para>
-<!--
- Instead of fetching the files to install their URIs are printed. Each
- URI will have the path, the destination file name, the size and the expected
- md5 hash. Note that the file name to write to will not always match
- the file name on the remote site! This also works with the
- <literal/source/ and <literal/update/ commands. When used with the
- <literal/update/ command the MD5 and size are not included, and it is
- up to the user to decompress any compressed files.
- Configuration Item: <literal/APT::Get::Print-URIs/.
--->
- 󥹥ȡ뤹եˡURIɽޤ
- URIˤϡѥоݥե̾ե륵ͽ¬ md5 ϥå
- ޤޤƤޤ
- ) Ϥե̾˥⡼ȥȤΥե̾Ȱפ櫓
- ǤϤޤ! <literal/source/ ޥɡ <literal/update/
- ޥɤǤưޤ
- MD5 ե륵ޤޤ <literal/update/ ǻѤȤˡ
- ̥եŸ뤳Ȥϥ桼ǤˤƹԤäƤ
- - <literal/APT::Get::Print-URIs/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--purge/</>
- <ListItem><Para>
-<!--
- Use purge instead of remove for anything that would be removed.
- Configuration Item: <literal/APT::Get::Purge/.
--->
- 硢ǤϤʤѤޤ
- - <literal/APT::Get::Purge/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--reinstall/</>
- <ListItem><Para>
-<!--
- Re-Install packages that are already installed and at the newest version.
- Configuration Item: <literal/APT::Get::ReInstall/.
--->
- Ǥ˺ǿǤ󥹥ȡ뤵ƤƤ⡢ѥåƥ󥹥ȡ뤷ޤ
- - <literal/APT::Get::ReInstall/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--list-cleanup/</>
- <ListItem><Para>
-<!--
- This option defaults to on, use <literal/- -no-list-cleanup/ to turn it
- off. When on <command/apt-get/ will automatically manage the contents of
- <filename>&statedir;/lists</> to ensure that obsolete files are erased.
- The only reason to turn it off is if you frequently change your source
- list.
- Configuration Item: <literal/APT::Get::List-Cleanup/.
--->
- εǽϥǥեȤ ON ˤʤäƤޤ
- OFF ˤˤ <literal/--no-list-cleanup/ ȤƤ
- ON ξ硢<command/apt-get/ ϸŤʤäեμ¤˾õ뤿ᡢ
- ưŪ <filename>&statedir;/lists</> ȤǤ礦
- OFF ˤΤϡʤꥹȤˤѹ餤Ǥ
- - <literal/APT::Get::List-Cleanup/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-t/</>
- <term><option/--target-release/</>
- <term><option/--default-release/</>
- <ListItem><Para>
-<!--
- This option controls the default input to the policy engine, it creates
- a default pin at priority 990 using the specified release string. The
- preferences file may further override this setting. In short, this option
- lets you have simple control over which distribution packages will be
- retrieved from. Some common examples might be
- <option>-t '2.1*'</> or <option>-t unstable</>.
- Configuration Item: <literal/APT::Default-Release/
--->
- Υץϥݥꥷ󥸥ؤΥǥեϤ椷ޤ
- ϡꤵ줿꡼ʸѤǥե pin ͥ 990
- Ǻ뤳ȤǤ
- ͥեϤ񤭤ޤ
- פˤΥץϡɤۥѥå뤫ñ
- Ƥޤ
- ĤŪϡ<option>-t '2.1*'</> <option>-t unstable</>
- Ǥ礦
- - <literal/APT::Default-Release/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--trivial-only/</>
- <ListItem><Para>
-<!--
- Only perform operations that are 'trivial'. Logically this can be considered
- related to <option/- -assume-yes/, where <option/- -assume-yes/ will answer
- yes to any prompt, <option/- -trivial-only/ will answer no.
- Configuration Item: <literal/APT::Get::Trivial-Only/.
--->
- ֽפǤʤΤߤԤޤŪ <option/--assume-yes/
- ֤ȸʤȤǤޤ<option/--assume-yes/ ϼˤ٤ yes
- ޤ<option/--trivial-only/ Ϥ٤ no ޤ
- - <literal/APT::Get::Trivial-Only/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--no-remove/</>
- <ListItem><Para>
-<!--
- If any packages are to be removed apt-get immediately aborts without
- prompting.
- Configuration Item: <literal/APT::Get::Remove/
--->
- ѥåˤʤäȤץץȤɽǤޤ
- - <literal/APT::Get::Remove/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--only-source/</>
- <ListItem><Para>
-<!--
- Only has meaning for the <literal/source/ command. indicates that the
- given source names are not to be mapped through the binary table.
- Configuration Item: <literal/APT::Get::Only-Source/
--->
- <literal/source/ ޥɤǤΤ̣߰ޤ
- ꤵ줿̾Хʥơ֥˥ޥåפʤȤ򼨤ޤ
- - <literal/APT::Get::Only-Source/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--diff-only/</><term><option/--tar-only/</>
- <ListItem><Para>
-<!--
- Download only the diff or tar file of a source archive.
- Configuration Item: <literal/APT::Get::Diff-Only/ and
- <literal/APT::Get::Tar-Only/
--->
- ֤ diff ե tar եΥɤΤߤԤޤ
- - <literal/APT::Get::Diff-Only/ <literal/APT::Get::Tar-Only/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/--arch-only/</>
- <ListItem><Para>
-<!--
- Only process architecture-dependent build-dependencies.
- Configuration Item: <literal/APT::Get::Arch-Only/
--->
- ۰¸طβ򥢡ƥ˰¸ΤΤ߹Ԥޤ
- - <literal/APT::Get::Arch-Only/
- </Para></ListItem>
- </VarListEntry>
-
- &apt-commonoptions;
-
- </VariableList>
- </RefSect1>
-
- <RefSect1><Title>ե</>
- <variablelist>
- <VarListEntry><term><filename>/etc/apt/sources.list</></term>
- <ListItem><Para>
-<!--
- locations to fetch packages from.
- Configuration Item: <literal/Dir::Etc::SourceList/.
--->
- ѥåμ
- - <literal/Dir::Etc::SourceList/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>/etc/apt/apt.conf</></term>
- <ListItem><Para>
-<!--
- APT configuration file.
- Configuration Item: <literal/Dir::Etc::Main/.
--->
- APT ե롣
- - <literal/Dir::Etc::Main/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>/etc/apt/apt.conf.d/</></term>
- <ListItem><Para>
-<!--
- APT configuration file fragments
- Configuration Item: <literal/Dir::Etc::Parts/.
--->
- APT եҡ
- - <literal/Dir::Etc::Parts/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>/etc/apt/preferences</></term>
- <ListItem><Para>
-<!--
- version preferences file
- Configuration Item: <literal/Dir::Etc::Preferences/.
--->
- Сͥե롣
- - <literal/Dir::Etc::Preferences/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>&cachedir;/archives/</></term>
- <ListItem><Para>
-<!--
- storage area for retrieved package files.
- Configuration Item: <literal/Dir::Cache::Archives/.
--->
- ѤߥѥåեǼꥢ
- - <literal/Dir::Cache::Archives/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>&cachedir;/archives/partial/</></term>
- <ListItem><Para>
-<!--
- storage area for package files in transit.
- Configuration Item: <literal/Dir::Cache::Archives/ (implicit partial).
--->
- ѥåեǼꥢ
- - <literal/Dir::Cache::Archives/ (ɬŪԴǤ)
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>&statedir;/lists/</></term>
- <ListItem><Para>
-<!--
- storage area for state information for each package resource specified in
- &sources-list;
- Configuration Item: <literal/Dir::State::Lists/.
--->
- &sources-list; Υѥåͭξ־Ǽꥢ
- - <literal/Dir::State::Lists/
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><filename>&statedir;/lists/partial/</></term>
- <ListItem><Para>
-<!--
- storage area for state information in transit.
- Configuration Item: <literal/Dir::State::Lists/ (implicit partial).
--->
- ξ־Ǽꥢ
- - <literal/Dir::State::Lists/ (ɬŪԴǤ)
- </Para></ListItem>
- </VarListEntry>
- </variablelist>
- </RefSect1>
-
- <RefSect1><Title>Ϣ</>
- <para>
- &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;,
- &docdir; APT 桼, &apt-preferences;
- </para>
- </RefSect1>
-
- <RefSect1><Title>ǥå</>
- <para>
- <command/apt-get/ ェλ 0 ֤ޤ
- 顼ˤϽʤ 100 ֤ޤ
- </para>
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;
-</refentry>
diff --git a/doc/ja/apt-get.ja.8.xml b/doc/ja/apt-get.ja.8.xml
new file mode 100644
index 000000000..f503b89ef
--- /dev/null
+++ b/doc/ja/apt-get.ja.8.xml
@@ -0,0 +1,900 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-get</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-get</refname>
+<!--
+ <refpurpose>APT package handling utility -\- command-line interface</refpurpose>
+-->
+ <refpurpose>APT package handling utility -- コマンドラインインターフェース</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-get</command>
+ <arg><option>-hvs</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <group choice="req">
+ <arg>update</arg>
+ <arg>upgrade</arg>
+ <arg>dselect-upgrade</arg>
+ <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+ <arg>check</arg>
+ <arg>clean</arg>
+ <arg>autoclean</arg>
+ </group>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-get</command> is the command-line tool for handling packages, and may be
+ considered the user's "back-end" to other tools using the APT
+ library. Several "front-end" interfaces exist, such as dselect(8),
+ aptitude, synaptic, gnome-apt and wajig.</para>
+-->
+ <para><command>apt-get</command> は、
+ パッケージを操作するコマンドラインツールで、
+ APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。
+ 「フロントエンド」インターフェースには、dselect(8),
+ aptitude, synaptic, gnome-apt, wajig などがあります。</para>
+
+<!--
+ <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given, one of the
+ commands below must be present.</para>
+-->
+ <para><option>-h</option> オプションや <option>--help</option> オプションを除き、
+ 以下に挙げるコマンドが必要です。</para>
+
+ <variablelist>
+ <varlistentry><term>update</term>
+<!--
+ <listitem><para><literal>update</literal> is used to resynchronize the package index files from
+ their sources. The indexes of available packages are fetched from the
+ location(s) specified in <filename>/etc/apt/sources.list</filename>.
+ For example, when using a Debian archive, this command retrieves and
+ scans the <filename>Packages.gz</filename> files, so that information about new
+ and updated packages is available. An <literal>update</literal> should always be
+ performed before an <literal>upgrade</literal> or <literal>dist-upgrade</literal>. Please
+ be aware that the overall progress meter will be incorrect as the size
+ of the package files cannot be known in advance.</para></listitem>
+-->
+ <listitem><para><literal>update</literal>は、
+ 取得元からパッケージインデックスファイルの再同期を行うのに使用します。
+ 利用可能なパッケージのインデックスは、
+ <filename>/etc/apt/sources.list</filename> に記述した場所から取得します。
+ 例えば Debian アーカイブを利用する際、
+ このコマンドが <filename>Packages.gz</filename> ファイルを検索することで、
+ 新規または更新されたパッケージの情報が利用可能となります。
+ <literal>update</literal> は、<literal>upgrade</literal> や
+ <literal>dist-upgrade</literal> を行う前に常に実行してください。
+ 前もってパッケージファイルのサイズを知ることができないため、
+ 全体の進捗メータは正しく表示されません。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>upgrade</term>
+<!--
+ <listitem><para><literal>upgrade</literal> is used to install the newest versions of all packages
+ currently installed on the system from the sources enumerated in
+ <filename>/etc/apt/sources.list</filename>. Packages currently installed with
+ new versions available are retrieved and upgraded; under no circumstances
+ are currently installed packages removed, or packages not already installed
+ retrieved and installed. New versions of currently installed packages that
+ cannot be upgraded without changing the install status of another package
+ will be left at their current version. An <literal>update</literal> must be
+ performed first so that <command>apt-get</command> knows that new versions of packages are
+ available.</para></listitem>
+-->
+ <listitem><para><literal>upgrade</literal> は、
+ 現在システムにインストールされている全パッケージの最新バージョンを、
+ <filename>/etc/apt/sources.list</filename>
+ に列挙した取得元からインストールするのに使用します。
+ 現在インストール中のパッケージに新しいバージョンがあれば更新しますが、
+ いかなる時も現在インストール中のパッケージの削除は行いません。
+ 対象のパッケージが、
+ 他のパッケージのインストール状態を変更せずに更新できない場合は、
+ 現在のバージョンのままとなります。
+ 最初に <literal>update</literal> を実行しておき、
+ <command>apt-get</command> にパッケージの新しいバージョンがあることを
+ 知らせる必要があります。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>dselect-upgrade</term>
+<!--
+ <listitem><para><literal>dselect-upgrade</literal>
+ is used in conjunction with the traditional Debian packaging
+ front-end, &dselect;. <literal>dselect-upgrade</literal>
+ follows the changes made by &dselect; to the <literal>Status</literal>
+ field of available packages, and performs the actions necessary to realize
+ that state (for instance, the removal of old and the installation of new
+ packages).</para></listitem>
+-->
+ <listitem><para><literal>dselect-upgrade</literal> は、
+ 伝統的な Debian GNU/Linux パッケージ管理フロントエンドの &dselect;
+ と共に使用されます。
+ <literal>dselect-upgrade</literal> は、
+ &dselect; で作られた利用可能パッケージの
+ <literal>Status</literal> フィールドの変更を追跡し、
+ その状態を反映させるのに必要なアクションを実行します。
+ (例えば、古いパッケージの削除や新しいパッケージのインストールなど) </para></listitem>
+
+ </varlistentry>
+
+ <varlistentry><term>dist-upgrade</term>
+<!--
+ <listitem><para><literal>dist-upgrade</literal> in addition to performing the function of
+ <literal>upgrade</literal>, also intelligently handles changing dependencies
+ with new versions of packages; <command>apt-get</command> has a "smart" conflict
+ resolution system, and it will attempt to upgrade the most important
+ packages at the expense of less important ones if necessary.
+ The <filename>/etc/apt/sources.list</filename> file contains a list of locations
+ from which to retrieve desired package files.
+ See also &apt-preferences; for a mechanism for
+ overriding the general settings for individual packages.</para></listitem>
+-->
+ <listitem><para><literal>dist-upgrade</literal> は、
+ <literal>upgrade</literal> の機能に加え、
+ 新バージョンのパッケージに対する依存関係の変更を知的に操作します。
+ <command>apt-get</command> は「洗練された」競合解決システムを持ち、
+ 必要とあらば比較的重要でないパッケージを犠牲にして、
+ 最重要パッケージの更新を試みます。
+ <filename>/etc/apt/sources.list</filename> ファイルには、
+ 必要なパッケージファイルを検索する場所のリストが含まれています。
+ 特定のパッケージ向けに、一般的な設定を上書きする機構については、
+ &apt-preferences; をご覧ください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>install</term>
+<!--
+ <listitem><para><literal>install</literal> is followed by one or more packages desired for
+ installation. Each package is a package name, not a fully qualified
+ filename (for instance, in a Debian GNU/Linux system, libc6 would be the
+ argument provided, not <literal>libc6_1.9.6-2.deb</literal>) All packages required
+ by the package(s) specified for installation will also be retrieved and
+ installed. The <filename>/etc/apt/sources.list</filename> file is used to locate
+ the desired packages. If a hyphen is appended to the package name (with
+ no intervening space), the identified package will be removed if it is
+ installed. Similarly a plus sign can be used to designate a package to
+ install. These latter features may be used to override decisions made by
+ apt-get's conflict resolution system.</para>
+-->
+ <listitem><para><literal>install</literal> の後には、
+ インストールするパッケージを 1 つ以上指定します。
+ 指定するパッケージは、完全なファイル名ではなくパッケージ名です。
+ (例えば Debian GNU/Linux システムでは、
+ <literal>libc6_1.9.6-2.deb</literal> ではなく libc6 を引数として与えます)
+ インストールするよう指定したすべてのパッケージに対し、
+ 検索・インストールを行います。
+ <filename>/etc/apt/sources.list</filename> ファイルを、
+ 要求するパッケージの場所を特定するのに使用します。
+ パッケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、
+ そのパッケージがインストールされていれば削除します。
+ 同様に、インストールするパッケージを明示するのにプラス記号も使用できます。
+ この記号は apt-get の競合解決システムの判断に利用されるかもしれません。</para>
+
+<!--
+ <para>A specific version of a package can be selected for installation by
+ following the package name with an equals and the version of the package
+ to select. This will cause that version to be located and selected for
+ install. Alternatively a specific distribution can be selected by
+ following the package name with a slash and the version of the
+ distribution or the Archive name (stable, testing, unstable).</para>
+-->
+ <para>パッケージにイコール記号とバージョンを続けることで、
+ 選択したバージョンのパッケージをインストールすることができます。
+ つまり、指定のバージョンのパッケージをインストールするように選択する、
+ ということです。
+ 別の方法としては、ディストリビューションを特定するのに、
+ パッケージ名に続けて、
+ スラッシュとディストリビューションのバージョンやアーカイブ名
+ (stable, testing, unstable) を記述できます。</para>
+
+<!--
+ <para>Both of the version selection mechanisms can downgrade packages and must
+ be used with care.</para>
+-->
+ <para>バージョン選択機構はダウングレード時にも使用できるため、
+ 注意して使用しなければなりません。</para>
+
+<!--
+ <para>Finally, the &apt-preferences; mechanism allows you to
+ create an alternative installation policy for
+ individual packages.</para>
+-->
+ <para>最後に、&apt-preferences; 機構により、
+ 特定のパッケージに対するインストールポリシーを作成できます。</para>
+
+<!--
+ <para>If no package matches the given expression and the expression contains one
+ of '.', '?' or '*' then it is assumed to be a POSIX regular expression,
+ and it is applied
+ to all package names in the database. Any matches are then installed (or
+ removed). Note that matching is done by substring so 'lo.*' matches 'how-lo'
+ and 'lowest'. If this is undesired, anchor the regular expression
+ with a '^' or '$' character, or create a more specific regular expression.</para></listitem>
+-->
+ <para>構文に '.', '?', '*' を含み、パッケージ名がマッチしなかった場合、
+ POSIX 正規表現であると見なし、
+ データベース内の全パッケージ名に対して適用します。
+ マッチしたパッケージすべてがインストール(もしくは削除)されます。
+ 'lo.*' のような文字列は、
+ 'how-lo' や 'lowest' にマッチすることに注意してください。
+ そうしたくなければ、'^' や '$' を付けるか、
+ もっと詳しい正規表現を指定してください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>remove</term>
+<!--
+ <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are
+ removed instead of installed. If a plus sign is appended to the package
+ name (with no intervening space), the identified package will be
+ installed instead of removed.</para></listitem>
+-->
+ <listitem><para><literal>remove</literal> は、
+ パッケージが削除されることを除き、<literal>install</literal> と同様です。
+ プラス記号がパッケージ名に (間に空白を含まずに) 付加されると、
+ 識別されたパッケージを、削除ではなくインストールします。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>source</term>
+<!--
+ <listitem><para><literal>source</literal> causes <command>apt-get</command> to fetch source packages. APT
+ will examine the available packages to decide which source package to
+ fetch. It will then find and download into the current directory the
+ newest available version of that source package. Source packages are
+ tracked separately from binary packages via <literal>deb-src</literal> type lines
+ in the &sources-list; file. This probably will mean that you will not
+ get the same source as the package you have installed or as you could
+ install. If the -\-compile options is specified then the package will be
+ compiled to a binary .deb using dpkg-buildpackage, if -\-download-only is
+ specified then the source package will not be unpacked.</para>
+-->
+ <listitem><para><literal>source</literal> は、
+ ソースパッケージを取得するのに <command>apt-get</command> します。
+ APT はどのソースパッケージを取得するか決定するよう、
+ 利用可能なパッケージを検討します。
+ その後、最新の利用可能なソースパッケージを見つけ、
+ カレントディレクトリへダウンロードします。
+ バイナリパッケージとは別に &sources-list; ファイルの
+ <literal>deb-src</literal> 行から、ソースパッケージを追跡します。
+ これは、インストールした (またはインストールできる) パッケージと、
+ 取得元を変えることができることを示しています。
+ --compile オプションが指定された場合、dpkg-buildpackage を用いて
+ バイナリ .deb ファイルへコンパイルを行います。
+ --download-only の場合はソースパッケージを展開しません。</para>
+
+<!--
+ <para>A specific source version can be retrieved by postfixing the source name
+ with an equals and then the version to fetch, similar to the mechanism
+ used for the package files. This enables exact matching of the source
+ package name and version, implicitly enabling the
+ <literal>APT::Get::Only-Source</literal> option.</para>
+-->
+ <para>パッケージと同様に、
+ ソース名の後ろにイコールと取得したいバージョンを置くと、
+ 指定したバージョンのソースを取得できます。
+ <literal>APT::Get::Only-Source</literal>
+ オプションが暗黙のうちに有効になっているため、
+ ソースパッケージ名とバージョンに厳密に一致させています。</para>
+
+<!--
+ <para>Note that source packages are not tracked like binary packages, they
+ exist only in the current directory and are similar to downloading source
+ tar balls.</para></listitem>
+-->
+ <para>tar ball はカレントディレクトリにのみダウンロードされ、
+ カレントディレクトリに展開されることに注意してください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>build-dep</term>
+<!--
+ <listitem><para><literal>build-dep</literal> causes apt-get to install/remove packages in an
+ attempt to satisfy the build dependencies for a source package.</para></listitem>
+-->
+ <listitem><para><literal>build-dep</literal> は、
+ ソースパッケージの構築依存関係を満たすように、
+ パッケージのインストール・削除を行います。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>check</term>
+<!--
+ <listitem><para><literal>check</literal> is a diagnostic tool; it updates the package cache and checks
+ for broken dependencies.</para></listitem>
+-->
+ <listitem><para><literal>check</literal> は、
+ パッケージキャッシュの更新や壊れた依存関係をチェックする診断ツールです。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>clean</term>
+<!--
+ <listitem><para><literal>clean</literal> clears out the local repository of retrieved package
+ files. It removes everything but the lock file from
+ <filename>&cachedir;/archives/</filename> and
+ <filename>&cachedir;/archives/partial/</filename>. When APT is used as a
+ &dselect; method, <literal>clean</literal> is run automatically.
+ Those who do not use dselect will likely want to run <literal>apt-get clean</literal>
+ from time to time to free up disk space.</para></listitem>
+-->
+ <listitem><para><literal>clean</literal> は、
+ 取得したパッケージのローカルリポジトリを掃除します。
+ <filename>&cachedir;/archives/</filename> と
+ <filename>&cachedir;/archives/partial/</filename>
+ からロックファイル以外すべて削除します。
+ APT が &dselect; から呼ばれるときには、
+ 自動的に <literal>clean</literal> が実行されます。
+ dselectを使用しない場合は、ディスクスペースを解放するため、時々
+ <literal>apt-get clean</literal> を実行したくなるでしょう。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>autoclean</term>
+<!--
+ <listitem><para>Like <literal>clean</literal>, <literal>autoclean</literal> clears out the local
+ repository of retrieved package files. The difference is that it only
+ removes package files that can no longer be downloaded, and are largely
+ useless. This allows a cache to be maintained over a long period without
+ it growing out of control. The configuration option
+ <literal>APT::Clean-Installed</literal> will prevent installed packages from being
+ erased if it is set to off.</para></listitem>
+-->
+ <listitem><para><literal>clean</literal> と同様に、
+ <literal>autoclean</literal> は取得したパッケージのローカルリポジトリを掃除します。
+ 違いは、もうダウンロードされることがないパッケージファイルや、
+ ほとんど不要なパッケージファイルのみを削除することです。
+ このため、長い期間、キャッシュが管理できずに肥大化することなく、
+ 維持することができます。
+ 設定オプション <literal>APT::Clean-Installed</literal> に
+ off をセットしていれば、
+ インストール済のパッケージファイルが削除されるのを防げます。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-d</option></term><term><option>--download-only</option></term>
+<!--
+ <listitem><para>Download only; package files are only retrieved, not unpacked or installed.
+ Configuration Item: <literal>APT::Get::Download-Only</literal>.</para></listitem>
+-->
+ <listitem><para>ダウンロードのみ - パッケージファイルの取得のみを行い、
+ 展開・インストールを行いません。
+ 設定項目 - <literal>APT::Get::Download-Only</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term>
+<!--
+ <listitem><para>Fix; attempt to correct a system with broken dependencies in
+ place. This option, when used with install/remove, can omit any packages
+ to permit APT to deduce a likely solution. Any Package that are specified
+ must completely correct the problem. The option is sometimes necessary when
+ running APT for the first time; APT itself does not allow broken package
+ dependencies to exist on a system. It is possible that a system's
+ dependency structure can be so corrupt as to require manual intervention
+ (which usually means using &dselect; or <command>dpkg -\-remove</command> to eliminate some of
+ the offending packages). Use of this option together with <option>-m</option> may produce an
+ error in some situations.
+ Configuration Item: <literal>APT::Get::Fix-Broken</literal>.</para></listitem>
+-->
+ <listitem><para>修復 - 依存関係が壊れたシステムの修正を試みます。
+ このオプションを install や remove と一緒に使うときは、
+ パッケージを指定しなくてもかまいません。
+ どのパッケージを指定しても、完全に問題を解決します。APT 自体は、
+ システムに存在する壊れたパッケージ依存関係を許すことができないので、
+ 初めて APT を実行する場合、このオプションが必要になることがあります。
+ システムの依存関係構造にかなり問題がある場合は、
+ 手動で修正するよう要求することもあります。
+ (通常は、問題のあるパッケージを取り除くのに &dselect; や
+ <command>dpkg --remove</command> を使用します)
+ このオプションを <option>-m</option> オプションと同時に使用すると、
+ エラーになる状況があるかもしれません。
+ 設定項目 - <literal>APT::Get::Fix-Broken</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-m</option></term><term><option>--ignore-missing</option></term>
+ <term><option>--fix-missing</option></term>
+<!--
+ <listitem><para>Ignore missing packages; If packages cannot be retrieved or fail the
+ integrity check after retrieval (corrupted package files), hold back
+ those packages and handle the result. Use of this option together with
+ <option>-f</option> may produce an error in some situations. If a package is
+ selected for installation (particularly if it is mentioned on the
+ command line) and it could not be downloaded then it will be silently
+ held back.
+ Configuration Item: <literal>APT::Get::Fix-Missing</literal>.</para></listitem>
+-->
+ <listitem><para>欠落パッケージの無視 - パッケージが取得できなかったり、
+ (パッケージの破損で) 取得した後の整合性チェックを通らなかった場合、
+ そのパッケージの処理を保留し最後まで処理を続けます。
+ このオプションを <option>-f</option> オプションと同時に使用すると、
+ エラーになる状況があるかもしれません。
+ パッケージをインストールするよう選択している場合
+ (特にコマンドラインでの操作時) や、
+ ダウンロードできなかった場合に、なにも表示せず保留することになります。
+ 設定項目 - <literal>APT::Get::Fix-Missing</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--no-download</option></term>
+<!--
+ <listitem><para>Disables downloading of packages. This is best used with
+ <option>-\-ignore-missing</option> to force APT to use only the .debs it has
+ already downloaded.
+ Configuration Item: <literal>APT::Get::Download</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージのダウンロードを無効にします。
+ これはすでにダウンロードした .deb に対してのみ APT を行う場合に、
+ <option>--ignore-missing</option> と併せて使うのがよいでしょう。
+ 設定項目 - <literal>APT::Get::Download</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+<!--
+ <listitem><para>Quiet; produces output suitable for logging, omitting progress indicators.
+ More q's will produce more quiet up to a maximum of 2. You can also use
+ <option>-q=#</option> to set the quiet level, overriding the configuration file.
+ Note that quiet level 2 implies <option>-y</option>, you should never use -qq
+ without a no-action modifier such as -d, -\-print-uris or -s as APT may
+ decided to do something you did not expect.
+ Configuration Item: <literal>quiet</literal>.</para></listitem>
+-->
+ <listitem><para>静粛 - 進捗表示を省略し、
+ ログをとるのに便利な出力を行います。
+ 最大 2 つまで q を重ねることでより静粛にできます。
+ また、<option>-q=#</option> のように静粛レベルを指定して、
+ 設定ファイルを上書きすることもできます。
+ 静粛レベル 2 は <option>-y</option> を含んでいることに注意してください。
+ APT が意図しない決定を行うかもしれないので -d, --print-uris, -s のような
+ 操作を行わないオプションをつけずに -qq を使用するべきではありません。
+ 設定項目 - <literal>quiet</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-s</option></term>
+ <term><option>--simulate</option></term>
+ <term><option>--just-print</option></term>
+ <term><option>--dry-run</option></term>
+ <term><option>--recon</option></term>
+ <term><option>--no-act</option></term>
+<!--
+ <listitem><para>No action; perform a simulation of events that would occur but do not
+ actually change the system.
+ Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
+-->
+ <listitem><para>動作なし - なにが起こるのかのシミュレーションを行い、
+ 実際にはシステムの変更を行いません。
+ 設定項目 - <literal>APT::Get::Simulate</literal></para>
+
+<!--
+ <para>Simulate prints out
+ a series of lines each one representing a dpkg operation, Configure (Conf),
+ Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
+ and empty set of square brackets meaning breaks that are of no consequence
+ (rare).</para></listitem>
+-->
+ <para>シミュレートの結果、dpkg の動作を表す一連の行のそれぞれに、
+ 設定 (Conf)、削除 (Remv)、展開 (Inst) を表示します。
+ 角カッコは壊れたパッケージを表し、(まれに)
+ 空の角カッコは大した問題ではないことを表します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-y</option></term><term><option>--yes</option></term>
+ <term><option>--assume-yes</option></term>
+<!--
+ <listitem><para>Automatic yes to prompts; assume "yes" as answer to all prompts and run
+ non-interactively. If an undesirable situation, such as changing a held
+ package, trying to install a unauthenticated package or removing an essential package
+ occurs then <literal>apt-get</literal> will abort.
+ Configuration Item: <literal>APT::Get::Assume-Yes</literal>.</para></listitem>
+-->
+ <listitem><para>プロンプトへの自動承諾 - すべてのプロンプトに自動的に
+ "yes" と答え、非対話的に実行します。
+ 保留したパッケージの状態を変更したり、
+ 必須パッケージを削除するような不適切な状況の場合、
+ <literal>apt-get</literal> は処理を中断します。
+ 設定項目 - <literal>APT::Get::Assume-Yes</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-u</option></term><term><option>--show-upgraded</option></term>
+<!--
+ <listitem><para>Show upgraded packages; Print out a list of all packages that are to be
+ upgraded.
+ Configuration Item: <literal>APT::Get::Show-Upgraded</literal>.</para></listitem>
+-->
+ <listitem><para>更新パッケージ表示 -
+ 更新される全パッケージを一覧表示します。
+ 設定項目 - <literal>APT::Get::Show-Upgraded</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-V</option></term><term><option>--verbose-versions</option></term>
+<!--
+ <listitem><para>Show full versions for upgraded and installed packages.
+ Configuration Item: <literal>APT::Get::Show-Versions</literal>.</para></listitem>
+-->
+ <listitem><para>更新・インストールするパッケージのヴァージョンを、
+ すべて表示します。
+ 設定項目 - <literal>APT::Get::Show-Versions</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-b</option></term><term><option>--compile</option></term>
+ <term><option>--build</option></term>
+<!--
+ <listitem><para>Compile source packages after downloading them.
+ Configuration Item: <literal>APT::Get::Compile</literal>.</para></listitem>
+-->
+ <listitem><para>ソースパッケージをダウンロード後、コンパイルします。
+ 設定項目 - <literal>APT::Get::Compile</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--ignore-hold</option></term>
+<!--
+ <listitem><para>Ignore package Holds; This causes <command>apt-get</command> to ignore a hold
+ placed on a package. This may be useful in conjunction with
+ <literal>dist-upgrade</literal> to override a large number of undesired holds.
+ Configuration Item: <literal>APT::Ignore-Hold</literal>.</para></listitem>
+-->
+ <listitem><para>保留パッケージの無視 - パッケージの保留指示を無視して
+ <command>apt-get</command> を行います。
+ <literal>dist-upgrade</literal> と共に、
+ 大量のパッケージを保留の解除をするのに使用すると便利です。
+ 設定項目 - <literal>APT::Ignore-Hold</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--no-upgrade</option></term>
+<!--
+ <listitem><para>Do not upgrade packages; When used in conjunction with <literal>install</literal>,
+ <literal>no-upgrade</literal> will prevent packages on the command line
+ from being upgraded if they are already installed.
+ Configuration Item: <literal>APT::Get::Upgrade</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージ更新なし - <literal>install</literal>
+ と同時に使用すると、<literal>no-upgrade</literal> は、
+ 指定したパッケージがすでにインストールしてある場合に更新を行いません。
+ 設定項目 - <literal>APT::Get::Upgrade</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--force-yes</option></term>
+<!--
+ <listitem><para>Force yes; This is a dangerous option that will cause apt to continue
+ without prompting if it is doing something potentially harmful. It
+ should not be used except in very special situations. Using
+ <literal>force-yes</literal> can potentially destroy your system!
+ Configuration Item: <literal>APT::Get::force-yes</literal>.</para></listitem>
+-->
+ <listitem><para>強制承諾 -
+ APT が何か損傷を与えかねない動作をしようとした場合でも、
+ 確認の入力なしで実行してしまう危険なオプションです。
+ よほどの状況でなければ、使用しない方がいいでしょう。
+ <literal>force-yes</literal> は、あなたのシステムを破壊しかねません!
+ 設定項目 - <literal>APT::Get::force-yes</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--print-uris</option></term>
+<!--
+ <listitem><para>Instead of fetching the files to install their URIs are printed. Each
+ URI will have the path, the destination file name, the size and the expected
+ md5 hash. Note that the file name to write to will not always match
+ the file name on the remote site! This also works with the
+ <literal>source</literal> and <literal>update</literal> commands. When used with the
+ <literal>update</literal> command the MD5 and size are not included, and it is
+ up to the user to decompress any compressed files.
+ Configuration Item: <literal>APT::Get::Print-URIs</literal>.</para></listitem>
+-->
+ <listitem><para>インストールするファイルを取得する代わりに、
+ その URI を表示します。
+ URI には、パス、対象ファイル名、ファイルサイズ、
+ 予測される md5 ハッシュが含まれています。
+ 出力したファイル名が、
+ 常にリモートサイトのファイル名と一致するわけではない、
+ ということに注意してください!
+ これは <literal>source</literal> コマンド、
+ <literal>update</literal> コマンドでも動作します。
+ <literal>update</literal> で使用したときには、
+ MD5 やファイルサイズを含みません。
+ このとき、圧縮ファイルの展開はユーザの責任において行ってください。
+ 設定項目 - <literal>APT::Get::Print-URIs</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--purge</option></term>
+<!--
+ <listitem><para>Use purge instead of remove for anything that would be removed.
+ An asterisk ("*") will be displayed next to packages which are
+ scheduled to be purged.
+ Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
+-->
+ <listitem><para>削除する際、「削除」ではなく「完全削除」を行います。
+ 「完全削除」を行うと指示したパッケージ名の後には、
+ アスタリスク ("*") が付きます。
+ 設定項目 - <literal>APT::Get::Purge</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--reinstall</option></term>
+<!--
+ <listitem><para>Re-Install packages that are already installed and at the newest version.
+ Configuration Item: <literal>APT::Get::ReInstall</literal>.</para></listitem>
+-->
+ <listitem><para>すでに最新版がインストールされていても、
+ パッケージを再インストールします。
+ 設定項目 - <literal>APT::Get::ReInstall</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--list-cleanup</option></term>
+<!--
+ <listitem><para>This option defaults to on, use <literal>-\-no-list-cleanup</literal> to turn it
+ off. When on <command>apt-get</command> will automatically manage the contents of
+ <filename>&statedir;/lists</filename> to ensure that obsolete files are erased.
+ The only reason to turn it off is if you frequently change your source
+ list.
+ Configuration Item: <literal>APT::Get::List-Cleanup</literal>.</para></listitem>
+-->
+ <listitem><para>この機能はデフォルトで ON になっています。
+ OFF にするには <literal>--no-list-cleanup</literal> としてください。
+ ON の場合、
+ <command>apt-get</command> は古くなったファイルを確実に消去するため、
+ 自動的に <filename>&statedir;/lists</filename> の中身を管理します。
+ これを OFF にするのは、取得元リストを頻繁に変更する時ぐらいでしょう。
+ 設定項目 - <literal>APT::Get::List-Cleanup</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>-t</option></term>
+ <term><option>--target-release</option></term>
+ <term><option>--default-release</option></term>
+<!--
+ <listitem><para>This option controls the default input to the policy engine, it creates
+ a default pin at priority 990 using the specified release string. The
+ preferences file may further override this setting. In short, this option
+ lets you have simple control over which distribution packages will be
+ retrieved from. Some common examples might be
+ <option>-t '2.1*'</option> or <option>-t unstable</option>.
+ Configuration Item: <literal>APT::Default-Release</literal>;
+ see also the &apt-preferences; manual page.</para></listitem>
+-->
+ <listitem><para>このオプションは、
+ ポリシーエンジンへのデフォルト入力を制御します。
+ これは、指定されたリリース文字列を使用し、
+ デフォルト pin を優先度 990 で作成することです。
+ 優先ファイルはこの設定を上書きします。
+ 要するにこのオプションで、
+ どの配布パッケージを取得するかを簡単に管理します。
+ 一般的な例としては、
+ <option>-t '2.1*'</option> や <option>-t unstable</option> でしょう。
+ 設定項目 - <literal>APT::Default-Release</literal>
+ &apt-preferences; のマニュアルページもご覧ください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--trivial-only</option></term>
+<!--
+ <listitem><para>
+ Only perform operations that are 'trivial'. Logically this can be considered
+ related to <option>-\-assume-yes</option>, where <option>-\-assume-yes</option> will answer
+ yes to any prompt, <option>-\-trivial-only</option> will answer no.
+ Configuration Item: <literal>APT::Get::Trivial-Only</literal>.</para></listitem>
+-->
+ <listitem><para>
+ 「重要でない」操作のみを行います。
+ これは論理的に <option>--assume-yes</option> の仲間と見なせます。
+ <option>--assume-yes</option> は質問にすべて yes と答えますが、
+ <option>--trivial-only</option> はすべて no と答えます。
+ 設定項目 - <literal>APT::Get::Trivial-Only</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--no-remove</option></term>
+<!--
+ <listitem><para>If any packages are to be removed apt-get immediately aborts without
+ prompting.
+ Configuration Item: <literal>APT::Get::Remove</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージが削除される状況になったとき、
+ プロンプトを表示せず中断します。
+ 設定項目 - <literal>APT::Get::Remove</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--only-source</option></term>
+ <!--
+ <listitem><para>Only has meaning for the
+ <literal>source</literal> and <literal>build-dep</literal>
+ commands. Indicates that the given source names are not to be
+ mapped through the binary table. This means that if this option
+ is specified, these commands will only accept source package
+ names as arguments, rather than accepting binary package names
+ and looking up the corresponding source package. Configuration
+ Item: <literal>APT::Get::Only-Source</literal>.</para></listitem>
+-->
+ <listitem><para><literal>source</literal> コマンドと
+ <literal>build-dep</literal> コマンドでのみ意味があります。
+ 指定されたソース名がバイナリテーブルにマップされないようにします。
+ これは、このオプションを指定すると、
+ バイナリパッケージ名を受け付けて対応するソースパッケージを探すのではなく、
+ 引数にソースパッケージ名しか受け付けなくなる、ということです。
+ 設定項目 - <literal>APT::Get::Only-Source</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--diff-only</option></term><term><option>--tar-only</option></term>
+<!--
+ <listitem><para>Download only the diff or tar file of a source archive.
+ Configuration Item: <literal>APT::Get::Diff-Only</literal> and
+ <literal>APT::Get::Tar-Only</literal>.</para></listitem>
+-->
+ <listitem><para>ソースアーカイブの diff ファイルや
+ tar ファイルのダウンロードのみを行います。
+ 設定項目 - <literal>APT::Get::Diff-Only</literal>,
+ <literal>APT::Get::Tar-Only</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--arch-only</option></term>
+<!--
+ <listitem><para>Only process architecture-dependent build-dependencies.
+ Configuration Item: <literal>APT::Get::Arch-Only</literal>.</para></listitem>
+-->
+ <listitem><para>構築依存関係の解決を、
+ アーキテクチャに依存したもののみ行います。
+ 設定項目 - <literal>APT::Get::Arch-Only</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><option>--allow-unauthenticated</option></term>
+<!--
+ <listitem><para>Ignore if packages can't be authenticated and don't prompt about it.
+ This is usefull for tools like pbuilder.
+ Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージを確認できない場合に無視し、
+ それについて質問しません。
+ pbuilder のようなツールで便利です。
+ 設定項目 - <literal>APT::Get::AllowUnauthenticated</literal></para></listitem>
+ </varlistentry>
+
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+ <variablelist>
+ <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
+<!--
+ <listitem><para>Locations to fetch packages from.
+ Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
+-->
+ <listitem><para>パッケージの取得元。
+ 設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>
+<!--
+ <listitem><para>APT configuration file.
+ Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>
+-->
+ <listitem><para>APT 設定ファイル。
+ 設定項目 - <literal>Dir::Etc::Main</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
+<!--
+ <listitem><para>APT configuration file fragments
+ Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
+-->
+ <listitem><para>APT 設定ファイルの断片。
+ 設定項目 - <literal>Dir::Etc::Parts</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/preferences</filename></term>
+<!--
+ <listitem><para>Version preferences file.
+ This is where you would specify "pinning",
+ i.e. a preference to get certain packages
+ from a separate source
+ or from a different version of a distribution.
+ Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>
+-->
+ <listitem><para>バージョン優先ファイル。
+ ここに "pin" の設定を行います。
+ つまり、別々の取得元や異なるディストリビューションのバージョンの、
+ どこからパッケージを取得するかを設定します。
+ 設定項目 - <literal>Dir::Etc::Preferences</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&cachedir;/archives/</filename></term>
+<!--
+ <listitem><para>Storage area for retrieved package files.
+ Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>
+-->
+ <listitem><para>取得済みパッケージファイル格納エリア。
+ 設定項目 - <literal>Dir::Cache::Archives</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
+<!--
+ <listitem><para>Storage area for package files in transit.
+ Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>
+-->
+ <listitem><para>取得中パッケージファイル格納エリア。
+ 設定項目 - <literal>Dir::Cache::Archives</literal> (必然的に不完全)</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&statedir;/lists/</filename></term>
+<!--
+ <listitem><para>Storage area for state information for each package resource specified in
+ &sources-list;
+ Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
+-->
+ <listitem><para>&sources-list; のパッケージリソース特有の状態情報格納エリア。
+ 設定項目 - <literal>Dir::State::Lists</literal></para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
+<!--
+ <listitem><para> Storage area for state information in transit.
+ Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
+-->
+ <listitem><para>取得中の状態情報格納エリア。
+ 設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+<!--
+ <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
+ &apt-conf;, &apt-config;,
+ The APT User's guide in &docdir;, &apt-preferences;, the APT Howto.</para>
+-->
+ <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
+ &apt-conf;, &apt-config;,
+ &docdir; の APT ユーザーズガイド, &apt-preferences;, APT Howto</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+ <para><command>apt-get</command> returns zero on normal operation, decimal 100 on error.</para>
+-->
+ <para><command>apt-get</command> は正常終了時に 0 を返します。
+ エラー時には十進の 100 を返します。</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
diff --git a/doc/ja/apt-key.ja.8.xml b/doc/ja/apt-key.ja.8.xml
new file mode 100644
index 000000000..732ca9b1c
--- /dev/null
+++ b/doc/ja/apt-key.ja.8.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+ &apt-docinfo;
+
+ <refmeta>
+ <refentrytitle>apt-key</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-key</refname>
+<!--
+ <refpurpose>APT key management utility</refpurpose>
+-->
+ <refpurpose>APT キー管理ユーティリティ</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-key</command>
+ <arg><replaceable>command</replaceable>/</arg>
+ <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+ <para>
+<!--
+ <command>apt-key</command> is used to manage the list of keys used
+ by apt to authenticate packages. Packages which have been
+ authenticated using these keys will be considered trusted.
+-->
+ <command>apt-key</command> は、
+ apt が パッケージを認証するのに使用するキーの一覧を管理するのに使用します。
+ このキーで認証されたパッケージは、信頼するに足ると見なせるでしょう。
+ </para>
+</refsect1>
+
+<!--
+<refsect1><title>Commands</title>
+-->
+<refsect1><title>コマンド</title>
+ <variablelist>
+ <varlistentry><term>add <replaceable>filename</replaceable></term>
+ <listitem>
+ <para>
+
+<!--
+ Add a new key to the list of trusted keys. The key is read
+ from <replaceable>filename</replaceable>, or standard input if
+ <replaceable>filename</replaceable> is <literal>-</literal>.
+-->
+ 信頼キー一覧に新しいキーを追加します。
+ このキーは <replaceable>filename</replaceable> から読み込みますが、
+ <replaceable>filename</replaceable> を <literal>-</literal> とすると、
+ 標準入力から読み込みます。
+ </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>del <replaceable>keyid</replaceable></term>
+ <listitem>
+ <para>
+
+<!--
+ Remove a key from the list of trusted keys.
+-->
+ 信頼キー一覧からキーを削除します。
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>list</term>
+ <listitem>
+ <para>
+
+<!--
+ List trusted keys.
+-->
+ 信頼キーを一覧表示します。
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+
+ <varlistentry><term>update</term>
+ <listitem>
+ <para>
+
+<!--
+ Update the local keyring with the keyring of Debian archive
+ keys and removes from the keyring the archive keys which are no
+ longer valid.
+-->
+ Debian アーカイブキーで、ローカルキーリングを更新し、
+ もう有効でないキーをキーリングから削除します。
+
+ </para>
+
+ </listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+ <variablelist>
+ <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
+<!--
+ <listitem><para>Keyring of local trusted keys, new keys will be added here.</para></listitem>
+-->
+ <listitem><para>ローカル信頼キーのキーリング。
+ 新しいキーはここに追加されます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term>
+<!--
+ <listitem><para>Local trust database of archive keys.</para></listitem>
+-->
+ <listitem><para>アーカイブキーのローカル信頼データベース</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
+<!--
+ <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
+-->
+ <listitem><para>Debian アーカイブ信頼キーのキーリング</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
+<!--
+ <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
+-->
+ <listitem><para>削除された Debian アーカイブ信頼キーのキーリング</para></listitem>
+ </varlistentry>
+
+
+
+ </variablelist>
+
+</refsect1>
+
+<!--
+<refsect1><title>See Also</title>
+-->
+<refsect1><title>関連項目</title>
+<para>
+&apt-get;, &apt-secure;
+</para>
+</refsect1>
+
+ &manbugs;
+ &manauthor;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml
new file mode 100644
index 000000000..33a829076
--- /dev/null
+++ b/doc/ja/apt-secure.ja.8.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+ &apt-docinfo;
+
+ <refmeta>
+ <refentrytitle>apt-secure</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+<!-- NOTE: This manpage has been written based on the
+ Securing Debian Manual ("Debian Security
+ Infrastructure" chapter) and on documentation
+ available at the following sites:
+ http://wiki.debian.net/?apt06
+ http://www.syntaxpolice.org/apt-secure/
+ http://www.enyo.de/fw/software/apt-secure/
+-->
+<!-- TODO: write a more verbose example of how it works with
+ a sample similar to
+ http://www.debian-administration.org/articles/174
+ ?
+-->
+
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-secure</refname>
+<!--
+ <refpurpose>Archive authentication support for APT</refpurpose>
+-->
+ <refpurpose>APT アーカイブ認証サポート</refpurpose>
+ </refnamediv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+ <para>
+<!--
+ Starting with version 0.6, <command>apt</command> contains code
+ that does signature checking of the Release file for all
+ archives. This ensures that packages in the archive can't be
+ modified by people who have no access to the Release file signing
+ key.
+-->
+ バージョン 0.6 より、<command>apt</command> 全アーカイブに対する
+ Release ファイルの署名チェックコードが含まれています。
+ Release ファイル署名キーにアクセスできない人が、
+ アーカイブのパッケージの変更が確実にできないようにします。
+ </para>
+
+ <para>
+<!--
+ If a package comes from a archive without a signature or with a
+ signature that apt does not have a key for that package is
+ considered untrusted and installing it will result in a big
+ warning. <command>apt-get</command> will currently only warn
+ for unsigned archives, future releases might force all sources
+ to be verified before downloading packages from them.
+-->
+ パッケージに署名されなかったり、apt が知らないキーで署名されていた場合、
+ アーカイブから来たパッケージは、信頼されていないと見なし、
+ インストールの際に重要な警告が表示されます。
+ <command>apt-get</command> は、
+ 現在未署名のパッケージに対して警告するだけですが、
+ 将来のリリースでは、全ソースに対し、
+ パッケージダウンロード前に強制的に検証される可能性があります。
+ </para>
+
+ <para>
+<!--
+ The package frontends &apt-get;, &aptitude; and &synaptic; support this new
+ authentication feature.
+-->
+ &apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、
+ この新認証機能をサポートしています。
+ </para>
+</refsect1>
+
+<!--
+ <refsect1><title>Trusted archives</title>
+-->
+ <refsect1><title>信頼済アーカイブ</title>
+
+ <para>
+<!--
+ The chain of trust from an apt archive to the end user is made up of
+ different steps. <command>apt-secure</command> is the last step in
+ this chain, trusting an archive does not mean that the packages
+ that you trust it do not contain malicious code but means that you
+ trust the archive maintainer. Its the archive maintainer
+ responsibility to ensure that the archive integrity is correct.
+-->
+ apt アーカイブからエンドユーザまでの信頼の輪は、
+ いくつかのステップでo区政されています。
+ <command>apt-secure</command> は、この輪の最後のステップで、
+ アーカイブを信頼することは、
+ パッケージに悪意のあるコードが含まれていないと信頼するわけではありませんが、
+ アーカイブメンテナを信頼すると言うことです。
+ これは、アーカイブの完全性を保証するのは、
+ アーカイブメンテナの責任だということです。
+ </para>
+
+<!--
+ <para>apt-secure does not review signatures at a
+ package level. If you require tools to do this you should look at
+ <command>debsig-verify</command> and
+ <command>debsign</command> (provided in the debsig-verify and
+ devscripts packages respectively).</para>
+-->
+ <para>apt-secure はパッケージレベルの署名検証は行いません。
+ そのようなツールが必要な場合は、
+ <command>debsig-verify</command> や <command>debsign</command>
+ (debsig-verify パッケージと devscripts パッケージでそれぞれ提供されています)
+ を確認してください。</para>
+
+ <para>
+<!--
+ The chain of trust in Debian starts when a maintainer uploads a new
+ package or a new version of a package to the Debian archive. This
+ upload in order to become effective needs to be signed by a key of
+ a maintainer within the Debian maintainer's keyring (available in
+ the debian-keyring package). Maintainer's keys are signed by
+ other maintainers following pre-established procedures to
+ ensure the identity of the key holder.
+-->
+ Debian における信頼の輪は、
+ 新しいパッケージやパッケージの新しいバージョンを、
+ メンテナが Debian アーカイブにアップロードすることで始まります。
+ これは、Debian メンテナキーリング (debian-keyring パッケージにあります)
+ にあるメンテナのキーで署名しなければ、アップロードできないということです。
+ メンテナのキーは、キーの所有者のアイデンティティを確保するため、
+ 以下のような事前に確立した手段で、他のメンテナに署名されています。
+ </para>
+
+ <para>
+<!--
+ Once the uploaded package is verified and included in the archive,
+ the maintainer signature is stripped off, an MD5 sum of the package
+ is computed and put in the Packages file. The MD5 sum of all of the
+ packages files are then computed and put into the Release file. The
+ Release file is then signed by the archive key (which is created
+ once a year and distributed through the FTP server. This key is
+ also on the Debian keyring.
+-->
+ アップロードされたパッケージごとに、検証してアーカイブに格納します。
+ パッケージは、メンテナの署名をはがされ、 MD5 sum を計算されて、
+ Packages ファイルに格納されます。
+ その後、全パッケージファイルの MD5 sum を計算してから、
+ Release ファイルに置きます。
+ Release ファイルは、アーカイブキーで署名されます。
+ アーカイブキーは年ごとに作成され、FTP サーバで配布されます。
+ このキーも Debian キーリングに含まれます。
+ </para>
+
+ <para>
+<!--
+ Any end user can check the signature of the Release file, extract the MD5
+ sum of a package from it and compare it with the MD5 sum of the
+ package he downloaded. Prior to version 0.6 only the MD5 sum of the
+ downloaded Debian package was checked. Now both the MD5 sum and the
+ signature of the Release file are checked.
+-->
+ エンドユーザは誰でも、Release ファイルの署名をチェックし、
+ パッケージの MD5 sum を抽出して、ダウンロードしたパッケージの MD5 sum
+ と比較できます。
+ バージョン 0.6 以前では、ダウンロードした Debian パッケージの MD5 sum しか、
+ チェックしていませんでした。
+ 現在では、MD5 sum と Release ファイルの署名の両方でチェックします。
+ </para>
+
+<!--
+ <para>Notice that this is distinct from checking signatures on a
+ per package basis. It is designed to prevent two possible attacks:
+-->
+ <para>以上は、パッケージごとの署名チェックとは違うことに注意してください。
+ 以下の用に考えられる 2 種類の攻撃を防ぐよう設計されています。
+ </para>
+
+ <itemizedlist>
+<!--
+ <listitem><para><literal>Network "man in the middle"
+ attacks</literal>. Without signature checking, a malicious
+ agent can introduce himself in the package download process and
+ provide malicious software either by controlling a network
+ element (router, switch, etc.) or by redirecting traffic to a
+ rogue server (through arp or DNS spoofing
+ attacks).</para></listitem>
+-->
+ <listitem><para><literal>ネットワーク中間者攻撃</literal>
+ 署名をチェックしないと、
+ 悪意あるエージェントがパッケージダウンロードプロセスに割り込んだり、
+ ネットワーク構成要素 (ルータ、スイッチなど) の制御や、
+ 悪漢サーバへのネットワークトラフィックのリダイレクトなど
+ (arp 経由や DNS スプーフィング攻撃) で、
+ 悪意あるソフトウェアを掴まされたりします。</para></listitem>
+
+<!--
+ <listitem><para><literal>Mirror network compromise</literal>.
+ Without signature checking, a malicious agent can compromise a
+ mirror host and modify the files in it to propagate malicious
+ software to all users downloading packages from that
+ host.</para></listitem>
+-->
+ <listitem><para><literal>ミラーネットワーク感染</literal>.
+ 署名をチェックしないと、悪意あるエージェントがミラーホストに感染し、
+ このホストからダウンロードしたユーザすべてに、
+ 悪意あるソフトウェアが伝播するようにファイルを変更できます。</para></listitem>
+ </itemizedlist>
+
+<!--
+ <para>However, it does not defend against a compromise of the
+ Debian master server itself (which signs the packages) or against a
+ compromise of the key used to sign the Release files. In any case,
+ this mechanism can complement a per-package signature.</para>
+-->
+ <para>しかしこれは、
+ (パッケージに署名する) Debian マスターサーバ自体の感染や、
+ Release ファイルに署名するのに使用したキーの感染を防げません。
+ いずれにせよ、この機構はパッケージごとの署名を補完することができます。</para>
+</refsect1>
+
+<!--
+ <refsect1><title>User configuration</title>
+-->
+ <refsect1><title>ユーザの設定</title>
+ <para>
+<!--
+ <command>apt-key</command> is the program that manages the list
+ of keys used by apt. It can be used to add or remove keys although
+ an installation of this release will automatically provide the
+ default Debian archive signing keys used in the Debian package
+ repositories.
+-->
+ <command>apt-key</command> は、
+ apt が使用するキーリストを管理するプログラムです。
+ このリリースのインストールでは、Debian パッケージリポジトリで使用する、
+ キーで署名する デフォルトの Debian アーカイブを提供しますが、
+ <command>apt-key</command> でキーの追加・削除が行えます。
+ </para>
+ <para>
+<!--
+ In order to add a new key you need to first download it
+ (you should make sure you are using a trusted communication channel
+ when retrieving it), add it with <command>apt-key</command> and
+ then run <command>apt-get update</command> so that apt can download
+ and verify the <filename>Release.gpg</filename> files from the archives you
+ have configured.
+-->
+ 新しいキーを追加するためには、まずキーをダウンロードする必要があります。
+ (取得する際には、信頼できる通信チャネルを使用するよう、特に留意してください)
+ 取得したキーを、<command>apt-key</command> で追加し、
+ <command>apt-get update</command> を実行してください。
+ 以上により、apt は指定したアーカイブから、<filename>Release.gpg</filename>
+ ファイルをダウンロード・検証できるようになります。
+ </para>
+</refsect1>
+
+<!--
+<refsect1><title>Archive configuration</title>
+-->
+<refsect1><title>アーカイブの設定</title>
+ <para>
+<!--
+ If you want to provide archive signatures in an archive under your
+ maintenance you have to:
+-->
+ あなたがメンテナンスしているアーカイブで、アーカイブ署名を提供したい場合、
+ 以下のようにしてください。
+ </para>
+
+ <itemizedlist>
+<!--
+ <listitem><para><literal>Create a toplevel Release
+ file</literal>. if it does not exist already. You can do this
+ by running <command>apt-ftparchive release</command>
+ (provided inftp apt-utils).</para></listitem>
+-->
+ <listitem><para><literal>上位 Release ファイルの作成</literal>
+ 既にこれが存在しているのでなければ、
+ <command>apt-ftparchive release</command> (apt-utils で提供)
+ を実行して作成してください。</para></listitem>
+
+<!--
+ <listitem><para><literal>Sign it</literal>. You can do this by running
+ <command>gpg -abs -o Release.gpg Release</command>.</para></listitem>
+-->
+ <listitem><para><literal>署名</literal>
+ <command>gpg -abs -o Release.gpg Release</command> を実行して、
+ 署名してください。</para></listitem>
+
+<!--
+ <listitem><para><literal>Publish the key fingerprint</literal>,
+ that way your users will know what key they need to import in
+ order to authenticate the files in the
+ archive.</para></listitem>
+-->
+ <listitem><para><literal>キーの指紋を配布</literal>
+ これにより、アーカイブ内のファイル認証に、
+ どのキーをインポートする必要があるかを、
+ ユーザに知らせることになります。</para></listitem>
+
+ </itemizedlist>
+
+<!--
+ <para>Whenever the contents of the archive changes (new packages
+ are added or removed) the archive maintainer has to follow the
+ first two steps previously outlined.</para>
+-->
+ <para>アーカイブの内容に変化がある場合 (新しいパッケージの追加や削除)、
+ アーカイブメンテナは前述の最初の 1, 2 ステップに従わなければなりません。</para>
+
+</refsect1>
+
+<!--
+<refsect1><title>See Also</title>
+-->
+<refsect1><title>関連項目</title>
+<para>
+&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+&debsign; &debsig-verify;, &gpg;
+</para>
+
+<!--
+<para>For more backgound information you might want to review the
+<ulink
+url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian
+Security Infrastructure</ulink> chapter of the Securing Debian Manual
+(available also in the harden-doc package) and the
+<ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
+>Strong Distribution HOWTO</ulink> by V. Alex Brennen. </para>
+-->
+<para>詳細な背景情報を検証するのなら、
+the Securing Debian Manual (harden-doc パッケージにもあります) の
+<ulink
+url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian
+Security Infrastructure</ulink> 章と、
+V. Alex Brennen による
+<ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
+>Strong Distribution HOWTO</ulink> をご覧ください。</para>
+
+</refsect1>
+
+ &manbugs;
+ &manauthor;
+
+<!--
+<refsect1><title>Manpage Authors</title>
+-->
+<refsect1><title>マニュアルページ筆者</title>
+
+<!--
+<para>This man-page is based on the work of Javier Fernández-Sanguino
+Peña, Isaac Jones, Colin Walters, Florian Weimer and Michael Vogt.
+-->
+<para>このマニュアルページは Javier Fernández-Sanguino
+Peña, Isaac Jones, Colin Walters, Florian Weimer, Michael Vogt
+の作業を元にしています。
+</para>
+
+</refsect1>
+
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt-sortpkgs.ja.1.xml b/doc/ja/apt-sortpkgs.ja.1.xml
new file mode 100644
index 000000000..779620f0b
--- /dev/null
+++ b/doc/ja/apt-sortpkgs.ja.1.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt-sortpkgs</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt-sortpkgs</refname>
+<!--
+ <refpurpose>Utility to sort package index files</refpurpose>
+-->
+ <refpurpose>パッケージインデックスファイルのソートユーティリティ</refpurpose>
+
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>apt-sortpkgs</command>
+ <arg><option>-hvs</option></arg>
+ <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+ <arg><option>-c=<replaceable>file</replaceable></option></arg>
+ <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><command>apt-sortpkgs</command> will take an index file (Source index or Package
+ index) and sort the records so that they are ordered by the package name.
+ It will also sort the internal fields of each record according to the
+ internal sorting rules.</para>
+-->
+ <para><command>apt-sortpkgs</command> は、インデックスファイル
+ (ソースインデックスやパッケージインデックス) からレコードをソートし、
+ パッケージ名順に整えます。
+ また、内部のソート規則に従って、内部フィールドについてもソートを行います。</para>
+
+<!--
+ <para>
+ All output is sent to stdout, the input must be a seekable file.</para>
+-->
+ <para>
+ 出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+ &apt-cmdblurb;
+
+ <variablelist>
+ <varlistentry><term><option>-s</option></term><term><option>--source</option></term>
+ <listitem><para>
+<!--
+ Use Source index field ordering.
+ Configuration Item: <literal>APT::SortPkgs::Source</literal>.</para></listitem>
+-->
+ ソースインデックスフィールド順に並べ替え
+ 設定項目 - <literal>APT::SortPkgs::Source</literal>.</para></listitem>
+ </varlistentry>
+
+ &apt-commonoptions;
+
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-conf;</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+ <para><command>apt-sortpkgs</command> は正常終了時に 0 を返します。
+ エラー時には十進の 100 を返します。</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
diff --git a/doc/ja/apt.conf.ja.5.sgml b/doc/ja/apt.conf.ja.5.sgml
deleted file mode 100644
index 3634096f9..000000000
--- a/doc/ja/apt.conf.ja.5.sgml
+++ /dev/null
@@ -1,785 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.9 -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
-
- <refmeta>
- <refentrytitle>apt.conf</>
- <manvolnum>5</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
- <refname>apt.conf</>
-<!--
- <refpurpose>Configuration file for APT</>
--->
- <refpurpose>APT ե</>
- </refnamediv>
-
-<!--
- <RefSect1><Title>Description</>
--->
- <RefSect1><Title></>
- <para>
-<!--
- <filename/apt.conf/ is the main configuration file for the APT suite of
- tools, all tools make use of the configuration file and a common command line
- parser to provide a uniform environment. When an APT tool starts up it will
- read the configuration specified by the <envar/APT_CONFIG/ environment
- variable (if any) and then read the files in <literal/Dir::Etc::Parts/
- then read the main configuration file specified by
- <literal/Dir::Etc::main/ then finally apply the
- command line options to override the configuration directives, possibly
- loading even more config files.
--->
- <filename/apt.conf/ ϡAPT ġ뽸μեǤ
- եȶ̤Υޥɥ饤ѡȤäơ
- ٤ƤΥġĶǻѤǤޤ
- APT ġεưˤϡ<envar/APT_CONFIG/ Ķѿ˻ꤷ
- (¸ߤ) ɤ߹ߤޤ
- <literal/Dir::Etc::Parts/ Υեɤ߹ߤޤ
- θ <literal/Dir::Etc::main/ ǻꤷեɤ߹ߡ
- Ǹ˥ޥɥ饤󥪥ץǡեͤ񤭤ޤ
- <para>
-<!--
- The configuration file is organized in a tree with options organized into
- functional groups. Option specification is given with a double colon
- notation, for instance <literal/APT::Get::Assume-Yes/ is an option within
- the APT tool group, for the Get tool. Options do not inherit from their
- parent groups.
--->
- եϡǽ롼פȤ˷ΩƤ줿ץ
- ڹ¤ɽޤ
- ץƤϡ2 ĤΥǶڤޤ
- 㤨 <literal/APT::Get::Assume-Yes/ ϡAPT ġ륰롼פΡGet ġ
- ץǤץϡƥ롼פѾޤ
- <para>
-<!--
- Syntacticly the configuration language is modeled after what the ISC tools
- such as bind and dhcp use. Each line is of the form
- <literallayout>APT::Get::Assume-Yes "true";</literallayout> The trailing
- semicolon is required and the quotes are optional. A new scope can be
- opened with curly braces, like:
--->
- ʸˡϡbind dhcp Τ褦 ISC ġǥˤƤޤ
- ιԤ⡢<literallayout>APT::Get::Assume-Yes "true";</literallayout>
- 褦ʷǡߥǶڤޤޤѤϥץǤ
- ʲΤ褦楫åȤȡפ򳫤ȤǤޤ
-<informalexample><programlisting>
-APT {
- Get {
- Assume-Yes "true";
- Fix-Broken "true";
- };
-};
-</programlisting></informalexample>
-<!--
- with newlines placed to make it more readable. Lists can be created by
- opening a scope and including a single word enclosed in quotes followed by a
- semicolon. Multiple entries can be included, each seperated by a semicolon.
--->
- ޤŬԤ뤳Ȥǡɤߤ䤹ʤޤ
- ꥹȤϡסȤǰϤޤ줿ñ졢
- ƥߥ³뤳ȤǺǤޤ
- ߥǶڤ뤳ȤǡʣΥȥɽȤǤޤ
-<informalexample><programlisting>
-DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
-</programlisting></informalexample>
- <para>
-<!--
- In general the sample configuration file in
- <filename>&docdir;/examples/apt.conf</> &configureindex;
- is a good guide for how it should look.
--->
- <filename>&docdir;/examples/apt.conf</> &configureindex;
- ŪեΥץǤɤΤ褦ꤹ뤫ͤˤʤǤ礦
- <para>
-<!--
- Two specials are allowed, <literal/#include/ and <literal/#clear/.
- <literal/#include/ will include the given file, unless the filename
- ends in a slash, then the whole directory is included.
- <literal/#clear/ is used to erase a list of names.
--->
- <literal/#include/ <literal/#clear/ 2 Ĥ̤ʵˡޤ
- <literal/#include/ ϻꤷեߤޤ
- ե̾åǽäˤϡΥǥ쥯ȥ򤹤٤
- ߤޤ
- <literal/#clear/ ̾ΥꥹȤΤǤ
- <para>
-<!--
- All of the APT tools take a -o option which allows an arbitary configuration
- directive to be specified on the command line. The syntax is a full option
- name (<literal/APT::Get::Assume-Yes/ for instance) followed by an equals
- sign then the new value of the option. Lists can be appended too by adding
- a trailing :: to the list name.
--->
- ٤Ƥ APT ġǡޥɥ饤ǤդԤ
- -o ץ󤬻ѤǤޤ
- ʸˡϡʥץ̾ (㡢<literal/APT::Get::Assume-Yes/)
- 桢³ƥץοͤȤʤޤ
- ꥹ̾³::ä뤳ȤǡꥹȤɲä뤳ȤǤޤ
- <!-- arbitary = Ǥդ (ܤäƤʤäޤʼߤ) -->
- </RefSect1>
-
-<!--
- <RefSect1><Title>The APT Group</>
--->
- <RefSect1><Title>APT 롼</>
- <para>
-<!--
- This group of options controls general APT behavior as well as holding the
- options for all of the tools.
--->
- Υץ󥰥롼פϡġΤ˱ƶΤ롢Ū APT ο񤤤
- 椷ޤ
- <VariableList>
- <VarListEntry><Term>Architecture</Term>
- <ListItem><Para>
-<!--
- System Architecture; sets the architecture to use when fetching files and
- parsing package lists. The internal default is the architecture apt was
- compiled for.
--->
- ƥॢƥ - եꡢѥåꥹȤ
- ϤȤ˻Ѥ륢ƥ򥻥åȤޤ
- ǤΥǥեȤϡapt 򥳥ѥ뤷ƥǤ
- </VarListEntry>
-
- <VarListEntry><Term>Ignore-Hold</Term>
- <ListItem><Para>
-<!--
- Ignore Held packages; This global option causes the problem resolver to
- ignore held packages in its decision making.
--->
- αѥå̵ - ΥХ륪ץϡα
- ꤷѥå̵뤷ޤ
- <!-- problem resolver ǤΤ -->
- </VarListEntry>
-
- <VarListEntry><Term>Clean-Installed</Term>
- <ListItem><Para>
-<!--
- Defaults to on. When turned on the autoclean feature will remove any pacakges
- which can no longer be downloaded from the cache. If turned off then
- packages that are locally installed are also excluded from cleaning - but
- note that APT provides no direct means to reinstall them.
--->
- 󥹥ȡѤߥѥåκ -
- ǥեȤͭǤautoclean ǽ on λ
- Ǥʤʤäѥå򥭥å夫ޤ
- off ξϡ˥󥹥ȡ뤵Ƥѥåϡ
- оݤ鳰ޤ
- ) APT ϡå夫ѥåκƥ󥹥ȡˡ
- ľܤˤ󶡤ޤ
- </VarListEntry>
-
- <VarListEntry><Term>Immediate-Configure</Term>
- <ListItem><Para>
-<!--
- Disable Immedate Configuration; This dangerous option disables some
- of APT's ordering code to cause it to make fewer dpkg calls. Doing
- so may be necessary on some extremely slow single user systems but
- is very dangerous and may cause package install scripts to fail or worse.
- Use at your own risk.
--->
- ¨̵ - δʥץϡAPT ׵ᥳɤ̵ˤơ
- dpkg θƤӽФۤȤɤʤ褦ˤޤ
- ϡ٤󥰥桼ƥǤɬפ⤷ޤ󤬡
- ˴ǡѥåΥ󥹥ȡ륹ץȤԤꡢ
- ⤷ϤäȰȤ뤫⤷ޤ
- ǤǻѤƤ
- <!-- Immedate Immediate typo? -->
- </VarListEntry>
-
- <VarListEntry><Term>Force-LoopBreak</Term>
- <ListItem><Para>
-<!--
- Never Enable this option unless you -really- know what you are doing. It
- permits APT to temporarily remove an essential package to break a
- Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential
- packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option
- will work if the essential packages are not tar, gzip, libc, dpkg, bash or
- anything that those packages depend on.
--->
- 򤷤褦ȤƤΤˡȽäƤΤǤʤС
- ФˤΥץͭˤʤǤ
- Բķ (essential) ѥåδ֤ǡ (Conflicts)/ (Conflicts)
- (Conflicts)/ ɬ (Pre-Depend) Υ롼פȤˡ
- ԲķѥåŪ˺ơ롼פȴǽˤޤ
- <emphasis>ʥ롼פϤʤϤǡ
- ȤнʥХǤ</emphasis>
- Υץϡtar, gzip, libc, dpkg, bash Ȥ餬¸Ƥ
- ѥåʳԲķѥåưޤ
- </VarListEntry>
-
- <VarListEntry><Term>Cache-Limit</Term>
- <ListItem><Para>
-<!--
- APT uses a fixed size memory mapped cache file to store the 'available'
- information. This sets the size of that cache.
--->
- APT ϡѲǽ׾Ǽ뤿ˡꥵ
- ޥåץåեѤޤ
- ΥץϡΥå奵ꤷޤ
- </VarListEntry>
-
- <VarListEntry><Term>Build-Essential</Term>
- <ListItem><Para>
-<!--
- Defines which package(s) are considered essential build dependencies.
--->
- ۰¸طԲķʥѥåޤ
- </VarListEntry>
-
- <VarListEntry><Term>Get</Term>
- <ListItem><Para>
-<!--
- The Get subsection controls the &apt-get; tool, please see its
- documentation for more information about the options here.
--->
- ֥ Get &apt-get; ġ椷ޤ
- Υץξܺ٤ &apt-get; ʸ򻲾ȤƤ
- </VarListEntry>
-
- <VarListEntry><Term>Cache</Term>
- <ListItem><Para>
-<!--
- The Cache subsection controls the &apt-cache; tool, please see its
- documentation for more information about the options here.
--->
- ֥ Cache &apt-cache; ġ椷ޤ
- Υץξܺ٤ &apt-cache; ʸ򻲾ȤƤ
- </VarListEntry>
-
- <VarListEntry><Term>CDROM</Term>
- <ListItem><Para>
-<!--
- The CDROM subsection controls the &apt-cdrom; tool, please see its
- documentation for more information about the options here.
--->
- ֥ CDROM &apt-cdrom; ġ椷ޤ
- Υץξܺ٤ &apt-cdrom; ʸ򻲾ȤƤ
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>The Acquire Group</>
--->
- <RefSect1><Title>Acquire 롼</>
- <para>
-<!--
- The <literal/Acquire/ group of options controls the download of packages
- and the URI handlers.
--->
- <literal/Acquire/ ץ󥰥롼פϡѥåΥɤ
- URI ϥɥԤޤ
- <VariableList>
- <VarListEntry><Term>Queue-Mode</Term>
- <ListItem><Para>
-<!--
- Queuing mode; <literal/Queue-Mode/ can be one of <literal/host/ or
- <literal/access/ which determines how APT parallelizes outgoing
- connections. <literal/host/ means that one connection per target host
- will be opened, <literal/access/ means that one connection per URI type
- will be opened.
--->
- 塼⡼ - <literal/Queue-Mode/ APTɤΤ褦³Ԥ
- <literal/host/ <literal/access/ ǻǤޤ
- <literal/host/ ϡåȥۥȤȤ 1 ³򳫤ޤ
- <literal/access/ ϡURI פȤ 1 ³򳫤ޤ
- </VarListEntry>
-
- <VarListEntry><Term>Retries</Term>
- <ListItem><Para>
-<!--
- Number of retries to perform. If this is non-zero APT will retry failed
- files the given number of times.
--->
- ȥ饤βꤷޤ0 Ǥʤ硢APT ϼԤեФơ
- Ϳ줿ȥ饤Ԥޤ
- </VarListEntry>
-
- <VarListEntry><Term>Source-Symlinks</Term>
- <ListItem><Para>
-<!--
- Use symlinks for source archives. If set to true then source archives will
- be symlinked when possible instead of copying. True is the default
--->
- ֤Υܥå󥯤Ѥޤ
- true åȤƤȤǽʤ饳ԡ˥ܥå󥯤
- ĥޤtrue ǥեȤǤ
- </VarListEntry>
-
- <VarListEntry><Term>http</Term>
- <ListItem><Para>
-<!--
- HTTP URIs; http::Proxy is the default http proxy to use. It is in the
- standard form of <literal>http://[[user][:pass]@]host[:port]/</>. Per
- host proxies can also be specified by using the form
- <literal/http::Proxy::&lt;host&gt;/ with the special keyword <literal/DIRECT/
- meaning to use no proxies. The <envar/http_proxy/ environment variable
- will override all settings.
--->
- HTTP URI - http::Proxy ϡǥեȤǻѤ http ץǤ
- <literal>http://[[user][:pass]@]host[:port]/</>Ȥɸɽޤ
- ۥȤȤΥץξϡ<literal/http::Proxy::&lt;host&gt;/ Ȥ
- ȡץѤʤȤ̣ü쥭 <literal/DIRECT/
- Ѥƻꤹ뤳ȤǤޤ
- ٤ƤϡĶѿ <envar/http_proxy/ Ǿ񤭤ޤ
- <para>
-<!--
- Three settings are provided for cache control with HTTP/1.1 complient
- proxy caches. <literal/No-Cache/ tells the proxy to not use its cached
- response under any circumstances, <literal/Max-Age/ is sent only for
- index files and tells the cache to refresh its object if it is older than
- the given number of seconds. Debian updates its index files daily so the
- default is 1 day. <literal/No-Store/ specifies that the cache should never
- store this request, it is only set for archive files. This may be useful
- to prevent polluting a proxy cache with very large .deb files. Note:
- Squid 2.0.2 does not support any of these options.
--->
- HTTP/1.1 ΥץåˤĤơ3 ꤬ޤ
- <literal/No-Cache/ ϥץФơʤ⥭åѤʤ
- ޤ
- <literal/Max-Age/ ϡǥåեѤΤȤ
- 줿֤Ťäˡ֥Ȥեå夹褦
- å˻ؼޤ
- ǥեȤǤ 1 ȤʤäƤ뤿ᡢDebian ˤΥǥå
- ե򹹿ޤ
- <literal/No-Store/ ϡå夬ΥꥯȤǼ
- ֥եΤꤹ褦ꤷޤ
- ϡ礭.debեǥץå夬Τ
- ɤΤ⤷ޤ
- ) Squid 2.0.2 ǤϡΥץ򥵥ݡȤƤޤ
- <para>
-<!--
- The option <literal/timeout/ sets the timeout timer used by the method,
- this applies to all things including connection timeout and data timeout.
--->
- <literal/timeout/ ץϡˡǤΥॢȤޤǤλ֤
- ꤷޤ
- ˤϡ³ΥॢȤȥǡΥॢȤޤޤƤޤ
- <para>
-<!--
- One setting is provided to control the pipeline depth in cases where the
- remote server is not RFC conforming or buggy (such as Squid 2.0.2)
- <literal/Acquire::http::Pipeline-Depth/ can be a value from 0 to 5
- indicating how many outstanding requests APT should send. A value of
- zero MUST be specified if the remote host does not properly linger
- on TCP connections - otherwise data corruption will occur. Hosts which
- require this are in violation of RFC 2068.
--->
- ⡼ȥФ RFC Ǥʤäꡢ(Squid 2.0.2 Τ褦) Х
- äꤷȤΤˡѥץ饤οꤷޤ
- <literal/Acquire::http::Pipeline-Depth/ ˤꡢAPT Ǥ
- ꥯȤβ 0 5 ͤǤޤ
- ⡼ȥФŬڤǤʤTCP ³˻֤Ȥϡ
- <emphasis>ɬ</emphasis>0ͤꤷʤФʤޤ
- ǤʤСǡ»Ƥޤޤ
- 줬ɬפʥۥȤϡRFC 2068 ˰ȿƤޤ
- </VarListEntry>
-
- <VarListEntry><Term>ftp</Term>
- <ListItem><Para>
-<!--
- FTP URIs; ftp::Proxy is the default proxy server to use. It is in the
- standard form of <literal>ftp://[[user][:pass]@]host[:port]/</> and is
- overriden by the <envar/ftp_proxy/ environment variable. To use a ftp
- proxy you will have to set the <literal/ftp::ProxyLogin/ script in the
- configuration file. This entry specifies the commands to send to tell
- the proxy server what to connect to. Please see
- &configureindex; for an example of
- how to do this. The subsitution variables available are
- <literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/, <literal/$(SITE_USER)/,
- <literal/$(SITE_PASS)/, <literal/$(SITE)/, and <literal/$(SITE_PORT)/.
- Each is taken from it's respective URI component.
--->
- FTP URI - ftp::Proxy ϡǥեȤǻѤץФǤ
- <literal>ftp://[[user][:pass]@]host[:port]/</> Ȥɸɽޤ
- Ķѿ <envar/ftp_proxy/ Ǿ񤭤ޤ
- ftp ץѤˤϡե <literal/ftp::ProxyLogin/
- ץȤꤹɬפޤ
- ץФ³ޥɤ򡢤Υȥꤷޤ
- ɤΤ褦ˤΤ &configureindex; 򻲾ȤƤ
- ¾ˤ⡢<literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/,
- <literal/$(SITE_USER)/, <literal/$(SITE_PASS)/, <literal/$(SITE)/,
- <literal/$(SITE_PORT)/ ѲǽǤ
- ⡢줾 URI ȡǤ
- <para>
-<!--
- The option <literal/timeout/ sets the timeout timer used by the method,
- this applies to all things including connection timeout and data timeout.
--->
- <literal/timeout/ ץϡˡǤΥॢȤޤǤλ֤
- ꤷޤ
- ˤϡ³ΥॢȤȥǡΥॢȤޤޤƤޤ
- <para>
-<!--
- Several settings are provided to control passive mode. Generally it is
- safe to leave passive mode on, it works in nearly every environment.
- However some situations require that passive mode be disabled and port
- mode ftp used instead. This can be done globally, for connections that
- go through a proxy or for a specific host (See the sample config file
- for examples)
--->
- ΤĤϡѥå֥⡼ɤ椹ΤǤ
- Ūˡѥå֥⡼ɤΤޤޤˤƤǡ
- ۤܤɤʴĶǤưޤ
- Ǥϡѥå֥⡼ɤ̵Τᡢ
- ˥ݡȥ⡼ ftp Ѥɬפޤ
- ϡץ̤³ΥۥȤؤ³̤ͭǤ
- (ϥץե򻲾ȤƤ)
- <para>
-<!--
- It is possible to proxy FTP over HTTP by setting the <envar/ftp_proxy/
- environment variable to a http url - see the discussion of the http method
- above for syntax. You cannot set this in the configuration file and it is
- not recommended to use FTP over HTTP due to its low efficiency.
--->
- Ķѿ <envar/ftp_proxy/ http url ˤ FTP over HTTP Υץ
- ѲǽˤʤޤʸˡϾ http ˤĤƤ򻲾ȤƤ
- եǤ򥻥åȤ뤳ȤϤǤޤ
- ޤΨ FTP over HTTP ѤΤϿ侩ޤ
- <para>
-<!--
- The setting <literal/ForceExtended/ controls the use of RFC2428
- <literal/EPSV/ and <literal/EPRT/ commands. The defaut is false, which means
- these commands are only used if the control connection is IPv6. Setting this
- to true forces their use even on IPv4 connections. Note that most FTP servers
- do not support RFC2428.
--->
- <literal/ForceExtended/ RFC2428 <literal/EPSV/
- <literal/EPRT/ ޥɤλѤ椷ޤ
- ǥեȤǤ false Ǥϡȥ륳ͥ IPv6
- λˤΤߡΥޥɤѤȤȤǤ
- true ˥åȤȡIPv4 ͥǤ⶯Ūˡ
- ΥޥɤѤޤ
- ) ۤȤɤ FTP Ф RFC2428 򥵥ݡȤƤޤ
- </VarListEntry>
-
- <VarListEntry><Term>cdrom</Term>
- <ListItem><Para>
-<!--
- CDROM URIs; the only setting for CDROM URIs is the mount point,
- <literal/cdrom::Mount/ which must be the mount point for the CDROM drive
- as specified in <filename>/etc/fstab</>. It is possible to provide
- alternate mount and unmount commands if your mount point cannot be listed
- in the fstab (such as an SMB mount and old mount packages). The syntax
- is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within
- the cdrom block. It is important to have the trailing slash. Unmount
- commands can be specified using UMount.
--->
- CDROM URI - ޥȥݥȤΤߤԤޤ
- <filename>/etc/fstab</> ꤵƤ褦ˡCDROM ɥ饤֤
- ޥȥݥȤ <literal/cdrom::Mount/ ꤷʤФʤޤ
- (SMB ޥȤŤ mount ѥåʤ) ޥȥݥȤ fstab
- ҤǤʤ硢˥ޥȡޥȥޥɤѤǤޤ
- ʸˡϡcdrom ֥å
- <literallayout>"/cdrom/"::Mount "foo";</literallayout> ηǵҤޤ
- åˤĤΤϽפǤ
- ޥȥޥɤ UMount ǻꤹ뤳ȤǤޤ
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Directories</>
--->
- <RefSect1><Title>ǥ쥯ȥ</>
- <para>
-<!--
- The <literal/Dir::State/ section has directories that pertain to local
- state information. <literal/lists/ is the directory to place downloaded
- package lists in and <literal/status/ is the name of the dpkg status file.
- <literal/preferences/ is the name of the APT preferences file.
- <literal/Dir::State/ contains the default directory to prefix on all sub
- items if they do not start with <filename>/</> or <filename>./</>.
--->
- <literal/Dir::State/ ϡ־˴ؤǥ쥯ȥ
- ݻޤ
- <literal/lists/ ϡɤѥåǼǥ쥯ȥǡ
- <literal/status/ dpkg ξ֥ե̾ɽޤ
- <literal/preferences/ APT ե̾Ǥ
- <literal/Dir::State/ ˤϡ<filename>/</> <filename>./</>ǻϤޤʤ
- ֥ƥղä롢ǥեȥǥ쥯ȥޤǤޤ
- <para>
-<!--
- <literal/Dir::Cache/ contains locations pertaining to local cache
- information, such as the two package caches <literal/srcpkgcache/ and
- <literal/pkgcache/ as well as the location to place downloaded archives,
- <literal/Dir::Cache::archives/. Generation of caches can be turned off
- by setting their names to be blank. This will slow down startup but
- save disk space. It is probably prefered to turn off the pkgcache rather
- than the srcpkgcache. Like <literal/Dir::State/ the default
- directory is contained in <literal/Dir::Cache/
--->
- <literal/Dir::Cache/ ϥ륭å˴ؤǼƤޤ
- ϡɺѥ֤ξ򼨤 <literal/Dir::Cache::archives/
- Ʊ͡<literal/srcpkgcache/ <literal/pkgcache/ Υѥåå
- Ȥʤޤ
- 줾˥åȤ뤳Ȥǡå̵ˤǤޤ
- ϵư٤ʤޤǥڡˤʤޤ
- 餯srcpkgcache pkgcache ̵ˤ뤳Ȥ
- ¿Ȼפޤ
- <literal/Dir::State/ Ʊ͡<literal/Dir::Cache/
- ǥեȥǥ쥯ȥޤǤޤ
- <para>
-<!--
- <literal/Dir::Etc/ contains the location of configuration files,
- <literal/sourcelist/ gives the location of the sourcelist and
- <literal/main/ is the default configuration file (setting has no effect,
- unless it is done from the config file specified by
- <envar/APT_CONFIG/).
--->
- <literal/Dir::Etc/ եξǼƤޤ
- <literal/sourcelist/ ϥꥹȤξ򼨤
- <literal/main/ ϥǥեȤեǤ
- (<envar/APT_CONFIG/ եꤵ줿Τߡ
- θ̤ޤ)
- <para>
-<!--
- The <literal/Dir::Parts/ setting reads in all the config fragments in
- lexical order from the directory specified. After this is done then the
- main config file is loaded.
--->
- <literal/Dir::Parts/ ϡꤵ줿ǥ쥯ȥ꤫顢
- ñ̤ƤҤɤߤߤޤ
- ꤷˡᥤեɤޤ
- <para>
-<!--
- Binary programs are pointed to by <literal/Dir::Bin/. <literal/methods/
- specifies the location of the method handlers and <literal/gzip/,
- <literal/dpkg/, <literal/apt-get/, <literal/dpkg-source/,
- <literal/dpkg-buildpackage/ and <literal/apt-cache/ specify the location
- of the respective programs.
--->
- Хʥץ <literal/Dir::Bin/ ǻꤷޤ
- <literal/methods/ ϥ᥽åɥϥɥξꤷ
- <literal/gzip/, <literal/dpkg/, <literal/apt-get/, <literal/dpkg-source/,
- <literal/dpkg-buildpackage/, <literal/apt-cache/ Ϥ줾
- ץξꤷޤ
- </RefSect1>
-
-<!--
- <RefSect1><Title>APT in DSelect</>
--->
- <RefSect1><Title>DSelect Ǥ APT</>
- <para>
-<!--
- When APT is used as a &dselect; method several configuration directives
- control the default behaviour. These are in the <literal/DSelect/ section.
--->
- &dselect; APT Ѥݡ<literal/DSelect/ ʲ
- ܤǡǥեȤư椷ޤ
- <VariableList>
- <VarListEntry><Term>Clean</Term>
- <ListItem><Para>
-<!--
- Cache Clean mode; this value may be one of always, prompt, auto,
- pre-auto and never. always and prompt will remove all packages from
- the cache after upgrading, prompt (the default) does so conditionally.
- auto removes only those packages which are no longer downloadable
- (replaced with a new version for instance). pre-auto performs this
- action before downloading new packages.
--->
- å奯꡼⡼ - ͤ always, prompt, auto, pre-auto never
- ΤҤȤĤޤ
- always prompt Ϲ塢ѥå򥭥å夫ޤ
- (ǥեȤ) prompt ǤϾդǺޤ
- auto ϥǽѥå (㤨пС֤줿)
- ޤ
- pre-auto Ϥư򡢿ѥåɤľ˹Ԥޤ
- </VarListEntry>
-
- <VarListEntry><Term>Options</Term>
- <ListItem><Para>
-<!--
- The contents of this variable is passed to &apt-get; as command line
- options when it is run for the install phase.
--->
- ѿƤϡinstall Υޥɥ饤󥪥ץƱͤˡ
- &apt-get; Ϥޤ
- </VarListEntry>
-
- <VarListEntry><Term>UpdateOptions</Term>
- <ListItem><Para>
-<!--
- The contents of this variable is passed to &apt-get; as command line
- options when it is run for the update phase.
--->
- ѿƤϡupdate Υޥɥ饤󥪥ץƱͤˡ
- &apt-get; Ϥޤ
- </VarListEntry>
-
- <VarListEntry><Term>PromptAfterUpdate</Term>
- <ListItem><Para>
-<!--
- If true the [U]pdate operation in &dselect; will always prompt to continue.
- The default is to prompt only on error.
--->
- True ξ硢&dselect; [U]pdate ¹Իˡ³ԤΤΥץץȤ
- ɽޤǥեȤϥ顼ȯΤߤǤ
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>How APT calls dpkg</>
--->
- <RefSect1><Title>APT dpkg Ƥˡ</>
- <para>
-<!--
- Several configuration directives control how APT invokes &dpkg;. These are
- in the <literal/DPkg/ section.
--->
- ܤ APT ɤΤ褦 &dpkg; ƤӽФǤޤ
- <literal/DPkg/ ˤޤ
- <VariableList>
- <VarListEntry><Term>Options</Term>
- <ListItem><Para>
-<!--
- This is a list of options to pass to dpkg. The options must be specified
- using the list notation and each list item is passed as a single argument
- to &dpkg;.
--->
- dpkg ϤץΥꥹȤǤ
- ץϡꥹȵˡѤƻꤷʤФʤޤ
- ޤƥꥹȤñΰȤ &dpkg; Ϥޤ
- </VarListEntry>
-
- <VarListEntry><Term>Pre-Invoke</Term><Term>Post-Invoke</Term>
- <ListItem><Para>
-<!--
- This is a list of shell commands to run before/after invoking &dpkg;.
- Like <literal/Options/ this must be specified in list notation. The
- commands are invoked in order using <filename>/bin/sh</>, should any
- fail APT will abort.
--->
- &dpkg; ƤӽФǼ¹Ԥ륷륳ޥɤΥꥹȤǤ
- <literal/Options/ Τ褦ˡꥹȵˡǻꤷʤФʤޤ
- ޥɤ <filename>/bin/sh</> ѤƸƤӽФ졢
- ꤬СAPT ϰ۾ェλޤ
- </VarListEntry>
-
- <VarListEntry><Term>Pre-Install-Pkgs</Term>
- <ListItem><Para>
-<!--
- This is a list of shell commands to run before invoking dpkg. Like
- <literal/Options/ this must be specified in list notation. The commands
- are invoked in order using <filename>/bin/sh</>, should any fail APT
- will abort. APT will pass to the commands on standard input the
- filenames of all .deb files it is going to install, one per line.
--->
- &dpkg; ƤӽФ˼¹Ԥ륷륳ޥɤΥꥹȤǤ
- <literal/Options/ Τ褦ˡꥹȵˡǻꤷʤФʤޤ
- ޥɤ <filename>/bin/sh</> ѤƸƤӽФ졢
- ꤬СAPT ϰ۾ェλޤ
- APT ϥ󥹥ȡ뤷褦Ȥ .deb եΥե̾
- ҤȤĤĥޥɤɸϤޤ
- <para>
-<!--
- Version 2 of this protocol dumps more information, including the
- protocol version, the APT configuration space and the packages, files
- and versions being changed. Version 2 is enabled by setting
- <literal/DPkg::Tools::Options::cmd::Version/ to 2. <literal/cmd/ is a
- command given to <literal/Pre-Install-Pkgs/.
--->
- ΥץȥΥС 2 Ǥϡ(ץȥΥС
- APT ꥹڡѥåޤ) ܺپե롢
- ѹƤСϤޤ
- <literal/DPkg::Tools::Options::cmd::Version/ 2 򥻥åȤȡ
- С 2 ͭˤǤޤ
- <literal/cmd/ <literal/Pre-Install-Pkgs/ Ϳ륳ޥɤǤ
- </VarListEntry>
-
- <VarListEntry><Term>Run-Directory</Term>
- <ListItem><Para>
-<!--
- APT chdirs to this directory before invoking dpkg, the default is
- <filename>/</>.
--->
- APT dpkg ƤӽФˤΥǥ쥯ȥ˰ưޤ
- ǥեȤ <filename>/</> Ǥ
- </VarListEntry>
-
- <VarListEntry><Term>Build-Options</Term>
- <ListItem><Para>
-<!--
- These options are passed to &dpkg-buildpackage; when compiling packages,
- the default is to disable signing and produce all binaries.
--->
- ΥץϡѥåΥѥ &dpkg-buildpackage;
- Ϥޤ
- ǥեȤǤϡ̵̾ˤХʥޤ
- </VarListEntry>
- </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Debug Options</>
--->
- <RefSect1><Title>ǥХåץ</>
- <para>
-<!--
- Most of the options in the <literal/debug/ section are not interesting to
- the normal user, however <literal/Debug::pkgProblemResolver/ shows
- interesting output about the decisions dist-upgrade makes.
- <literal/Debug::NoLocking/ disables file locking so APT can do some
- operations as non-root and <literal/Debug::pkgDPkgPM/ will print out the
- command line for each dpkg invokation. <literal/Debug::IdentCdrom/ will
- disable the inclusion of statfs data in CDROM IDs.
--->
- <literal/debug/ ¿Υץϡ̤Υ桼ˤȤäƶ̣ΤǤ
- ޤ󡣤<literal/Debug::pkgProblemResolver/ ǡ
- dist-upgrade ȽǤˤĤƤζ̣Ϥޤ
- <literal/Debug::NoLocking/ ϡAPT root Ǥ褦
- եΥå̵ˤޤ <literal/Debug::pkgDPkgPM/ ϡ
- dpkg ƤֺݤΥޥɥ饤Ϥޤ
- <literal/Debug::IdentCdrom/ ϡCDROM ID ξ֥ǡޤ̵ˤޤ
- <!-- statfs status typo? -->
- </RefSect1>
-
-<!--
- <RefSect1><Title>Examples</>
--->
- <RefSect1><Title></>
- <para>
-<!--
- &configureindex; contains a
- sample configuration file showing the default values for all possible
- options.
--->
- &configureindex; ˡѲǽץΥǥեͤ򻲾ȤǤ롢
- եΥץ뤬ޤ
- </RefSect1>
-
-<!--
- <RefSect1><Title>Files</>
--->
- <RefSect1><Title>ե</>
- <para>
- <filename>/etc/apt/apt.conf</>
- </RefSect1>
-
-<!--
- <RefSect1><Title>See Also</>
--->
- <RefSect1><Title></>
- <para>
- &apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;.
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;
-
-</refentry>
diff --git a/doc/ja/apt.conf.ja.5.xml b/doc/ja/apt.conf.ja.5.xml
new file mode 100644
index 000000000..8707c801e
--- /dev/null
+++ b/doc/ja/apt.conf.ja.5.xml
@@ -0,0 +1,809 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt.conf</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt.conf</refname>
+<!--
+ <refpurpose>Configuration file for APT</refpurpose>
+-->
+ <refpurpose>APT 設定ファイル</refpurpose>
+ </refnamediv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+ <para><filename>apt.conf</filename> is the main configuration file for the APT suite of
+ tools, all tools make use of the configuration file and a common command line
+ parser to provide a uniform environment. When an APT tool starts up it will
+ read the configuration specified by the <envar>APT_CONFIG</envar> environment
+ variable (if any) and then read the files in <literal>Dir::Etc::Parts</literal>
+ then read the main configuration file specified by
+ <literal>Dir::Etc::main</literal> then finally apply the
+ command line options to override the configuration directives, possibly
+ loading even more config files.</para>
+-->
+ <para><filename>apt.conf</filename> は、
+ APT ツール集のメイン設定ファイルです。
+ この設定ファイルと共通のコマンドラインパーサを使って、
+ すべてのツールを統一環境で使用できます。
+ APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変数に指定した設定を
+ (存在すれば) 読み込みます。
+ 次に <literal>Dir::Etc::Parts</literal> のファイルを読み込みます。
+ 次に <literal>Dir::Etc::main</literal> で指定した主設定ファイルを読み込み、
+ 最後にコマンドラインオプションで、
+ 設定ファイルより取得した値を上書きします。</para>
+
+<!--
+ <para>The configuration file is organized in a tree with options organized into
+ functional groups. option specification is given with a double colon
+ notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within
+ the APT tool group, for the Get tool. options do not inherit from their
+ parent groups.</para>
+-->
+ <para>設定ファイルは、
+ 機能グループごとに系統立てられたオプションを木構造で表します。
+ オプションの内容は、2 つのコロンで区切ります。
+ 例えば <literal>APT::Get::Assume-Yes</literal> は、
+ APT ツールグループの、Get ツール用オプションです。
+ オプションは、親グループから継承しません。</para>
+
+<!--
+ <para>Syntacticly the configuration language is modeled after what the ISC tools
+ such as bind and dhcp use. Lines starting with
+ <literal>//</literal> are treated as comments (ignored).
+ Each line is of the form
+ <literal>APT::Get::Assume-Yes "true";</literal> The trailing
+ semicolon is required and the quotes are optional. A new scope can be
+ opened with curly braces, like:</para>
+ -->
+ <para>設定言語の文法は、
+ bind や dhcp のような ISC ツールをモデルにしています。
+ <literal>//</literal> で始まる行はコメントとして扱われます (無視)。
+ いずれの行も、<literallayout>APT::Get::Assume-Yes "true";</literallayout> の
+ ような形式です。
+ 行末のセミコロンは必要ですが、ダブルクォートは使わなくてもかまいません。
+ 以下のように中カッコを使うと、新しいスコープを開くことができます。</para>
+
+<informalexample><programlisting>
+APT {
+ Get {
+ Assume-Yes "true";
+ Fix-Broken "true";
+ };
+};
+</programlisting></informalexample>
+
+<!--
+ <para>with newlines placed to make it more readable. Lists can be created by
+ opening a scope and including a single word enclosed in quotes followed by a
+ semicolon. Multiple entries can be included, each separated by a semicolon.</para>
+-->
+ <para>また適宜改行することで、より読みやすくなります。
+ リストは、開いたスコープ、クォートで囲まれた単語、
+ そしてセミコロンと続けることで作成できます。
+ セミコロンで区切ることで、複数のエントリを表すことができます。</para>
+
+<informalexample><programlisting>
+DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
+</programlisting></informalexample>
+
+<!--
+ <para>In general the sample configuration file in
+ <filename>&docdir;examples/apt.conf</filename> &configureindex;
+ is a good guide for how it should look.</para>
+-->
+ <para><filename>&docdir;examples/apt.conf</filename> &configureindex;
+ は一般的な設定ファイルのサンプルです。
+ どのように設定するか参考になるでしょう。</para>
+
+<!--
+ <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal>
+ <literal>#include</literal> will include the given file, unless the filename
+ ends in a slash, then the whole directory is included.
+ <literal>#clear</literal> is used to erase a list of names.</para>
+-->
+ <para><literal>#include</literal> と <literal>#clear</literal> の
+ 2 つの特別な記法があります。
+ <literal>#include</literal> は指定したファイルを取り込みます。
+ ファイル名がスラッシュで終わった場合には、
+ そのディレクトリをすべて取り込みます。
+ <literal>#clear</literal> は名前のリストを削除するのに便利です。</para>
+
+<!--
+ <para>All of the APT tools take a -o option which allows an arbitrary configuration
+ directive to be specified on the command line. The syntax is a full option
+ name (<literal>APT::Get::Assume-Yes</literal> for instance) followed by an equals
+ sign then the new value of the option. Lists can be appended too by adding
+ a trailing :: to the list name.</para>
+-->
+ <para>すべての APT ツールで、
+ コマンドラインで任意の設定を行う -o オプションが使用できます。
+ 文法は、完全なオプション名 (例: <literal>APT::Get::Assume-Yes</literal>)、
+ 等号、続いてオプションの新しい値となります。
+ リスト名に続き::を加えることで、リストを追加することができます。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>The APT Group</title>
+-->
+ <refsect1><title>APT グループ</title>
+<!--
+ <para>This group of options controls general APT behavior as well as holding the
+ options for all of the tools.</para>
+-->
+ <para>このオプショングループは、ツール全体に影響のある、
+ 一般的な APT の振る舞いを制御します。</para>
+
+ <variablelist>
+ <varlistentry><term>Architecture</term>
+<!--
+ <listitem><para>System Architecture; sets the architecture to use when fetching files and
+ parsing package lists. The internal default is the architecture apt was
+ compiled for.</para></listitem>
+-->
+ <listitem><para>システムアーキテクチャ - ファイルを取得したり、
+ パッケージリストを解析するときに使用するアーキテクチャをセットします。
+ 内部でのデフォルトは、
+ apt をコンパイルしたアーキテクチャです。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Ignore-Hold</term>
+<!--
+ <listitem><para>Ignore Held packages; This global option causes the problem resolver to
+ ignore held packages in its decision making.</para></listitem>
+-->
+ <listitem><para>保留パッケージの無視 - このグローバルオプションは、
+ 問題解決器に保留と指定したパッケージを無視します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Clean-Installed</term>
+<!--
+ <listitem><para>Defaults to on. When turned on the autoclean feature will remove any packages
+ which can no longer be downloaded from the cache. If turned off then
+ packages that are locally installed are also excluded from cleaning - but
+ note that APT provides no direct means to reinstall them.</para></listitem>
+-->
+ <listitem><para>デフォルトで有効です。autoclean 機能が on の時、
+ ダウンロードできなくなったパッケージをキャッシュから削除します。
+ off の場合、ローカルにインストールされているパッケージは、
+ 削除対象から外します。
+ しかし、 APT はキャッシュから削除したパッケージの再インストール方法を、
+ 直接提供するわけではないことに注意してください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Immediate-Configure</term>
+<!--
+ <listitem><para>Disable Immediate Configuration; This dangerous option disables some
+ of APT's ordering code to cause it to make fewer dpkg calls. Doing
+ so may be necessary on some extremely slow single user systems but
+ is very dangerous and may cause package install scripts to fail or worse.
+ Use at your own risk.</para></listitem>
+-->
+ <listitem><para>即時設定無効 - この危険なオプションは、
+ APT の要求コードを無効にして dpkg の呼び出しをほとんどしないようにします。
+ これは、非常に遅いシングルユーザシステムでは必要かもしれませんが、
+ 非常に危険で、パッケージのインストールスクリプトが失敗したり、
+ もしくはもっと悪いことがおきるかもしれません。
+ 自己責任で使用してください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Force-LoopBreak</term>
+<!--
+ <listitem><para>Never Enable this option unless you -really- know what you are doing. It
+ permits APT to temporarily remove an essential package to break a
+ Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential
+ packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option
+ will work if the essential packages are not tar, gzip, libc, dpkg, bash or
+ anything that those packages depend on.</para></listitem>
+-->
+ <listitem><para>何をしようとしているのか「本当に」判っているのでなければ、
+ 絶対にこのオプションを有効にしないでください。
+ 不可欠 (essential) パッケージ同士で、
+ 競合 (Conflicts) /競合や競合/事前依存 (Pre-Depend)
+ のループに落ち込んだときに、
+ 不可欠パッケージを一時的に削除してループを抜けられるようにします。
+ <emphasis>そんなループはあり得ないはずで、
+ あるとすれば重大なバグです。</emphasis>
+ このオプションは、tar, gzip, libc, dpkg, bash とそれらが依存している
+ パッケージ以外の不可欠パッケージで動作します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Cache-Limit</term>
+<!--
+ <listitem><para>APT uses a fixed size memory mapped cache file to store the 'available'
+ information. This sets the size of that cache (in bytes).</para></listitem>
+-->
+ <listitem><para>APT は「利用可能」情報を格納するために、
+ 固定サイズのメモリマップキャッシュファイルを使用します。
+ このオプションは、そのキャッシュサイズを指定します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Build-Essential</term>
+<!--
+ <listitem><para>Defines which package(s) are considered essential build dependencies.</para></listitem>
+-->
+ <listitem><para>構築依存関係で不可欠なパッケージを定義します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Get</term>
+<!--
+ <listitem><para>The Get subsection controls the &apt-get; tool, please see its
+ documentation for more information about the options here.</para></listitem>
+-->
+ <listitem><para>サブセクション Get は &apt-get; ツールを制御します。
+ このオプションの詳細は &apt-get; の文書を参照してください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Cache</term>
+<!--
+ <listitem><para>The Cache subsection controls the &apt-cache; tool, please see its
+ documentation for more information about the options here.</para></listitem>
+-->
+ <listitem><para>サブセクション Cache は &apt-cache; ツールを制御します。
+ このオプションの詳細は &apt-cache; の文書を参照してください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>CDROM</term>
+<!--
+ <listitem><para>The CDROM subsection controls the &apt-cdrom; tool, please see its
+ documentation for more information about the options here.</para></listitem>
+-->
+ <listitem><para>サブセクション CDROM は &apt-cdrom; ツールを制御します。
+ このオプションの詳細は &apt-cdrom; の文書を参照してください。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>The Acquire Group</title>
+-->
+ <refsect1><title>Acquire グループ</title>
+<!--
+ <para>The <literal>Acquire</literal> group of options controls the download of packages
+ and the URI handlers.
+-->
+ <para><literal>Acquire</literal> オプショングループは、
+ パッケージのダウンロードや URI ハンドラの制御を行います。
+ <variablelist>
+ <varlistentry><term>Queue-Mode</term>
+<!--
+ <listitem><para>Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</literal> or
+ <literal>access</literal> which determines how APT parallelizes outgoing
+ connections. <literal>host</literal> means that one connection per target host
+ will be opened, <literal>access</literal> means that one connection per URI type
+ will be opened.</para></listitem>
+-->
+ <listitem><para>キューモード - <literal>Queue-Mode</literal> は、
+ APT がどのように並列接続を行うか、
+ <literal>host</literal> か <literal>access</literal> で指定できます。
+ <literal>host</literal> は、ターゲットホストごとに 1 接続を開きます。
+ <literal>access</literal> は、
+ URI タイプごとに 1 接続を開きます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Retries</term>
+<!--
+ <listitem><para>Number of retries to perform. If this is non-zero APT will retry failed
+ files the given number of times.</para></listitem>
+-->
+ <listitem><para>リトライの回数を設定します。
+ 0 でない場合、APT は失敗したファイルに対して、
+ 与えられた回数だけリトライを行います。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Source-Symlinks</term>
+<!--
+ <listitem><para>Use symlinks for source archives. If set to true then source archives will
+ be symlinked when possible instead of copying. True is the default.</para></listitem>
+-->
+ <listitem><para>ソースアーカイブのシンボリックリンクを使用します。
+ true がセットされているとき、可能ならコピーの代わりにシンボリックリンクが
+ 張られます。true がデフォルトです。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>http</term>
+<!--
+ <listitem><para>HTTP URIs; http::Proxy is the default http proxy to use. It is in the
+ standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per
+ host proxies can also be specified by using the form
+ <literal>http::Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal>
+ meaning to use no proxies. The <envar>http_proxy</envar> environment variable
+ will override all settings.</para>
+-->
+ <listitem><para>HTTP URI - http::Proxy は、
+ デフォルトで使用する http プロキシです。
+ <literal>http://[[user][:pass]@]host[:port]/</literal>
+ という標準形で表します。ホストごとのプロキシの場合は、
+ <literal>http::Proxy::&lt;host&gt;</literal> という形と、
+ プロキシを使用しないという意味の特殊キーワード <literal>DIRECT</literal>
+ を使用して指定することもできます。すべての設定は、
+ 環境変数 <envar>http_proxy</envar> で上書きされます。</para>
+
+<!--
+ <para>Three settings are provided for cache control with HTTP/1.1 compliant
+ proxy caches. <literal>No-Cache</literal> tells the proxy to not use its cached
+ response under any circumstances, <literal>Max-Age</literal> is sent only for
+ index files and tells the cache to refresh its object if it is older than
+ the given number of seconds. Debian updates its index files daily so the
+ default is 1 day. <literal>No-Store</literal> specifies that the cache should never
+ store this request, it is only set for archive files. This may be useful
+ to prevent polluting a proxy cache with very large .deb files. Note:
+ Squid 2.0.2 does not support any of these options.</para>
+-->
+ <para>HTTP/1.1 準拠のプロキシキャッシュの制御について、
+ 3 種類の設定があります。<literal>No-Cache</literal> はプロキシに対して、
+ いかなる時もキャッシュを使用しないと伝えます。
+ <literal>Max-Age</literal> は、インデックスファイル用のときだけ送信し、
+ 得られた時間よりも古かった場合に、
+ オブジェクトをリフレッシュするようキャッシュに指示します。
+ デフォルトでは 1 日となっているため、
+ Debian は日毎にそのインデックスファイルを更新します。
+ <literal>No-Store</literal> は、キャッシュがこのリクエストを格納せず、
+ アーカイブファイルのみ設定するよう指定します。
+ これは、非常に大きな .deb ファイルでプロキシキャッシュが汚れるのを、
+ 防ぐのに便利かもしれません。
+ 注) Squid 2.0.2 では、これらのオプションをサポートしていません。</para>
+
+<!--
+ <para>The option <literal>timeout</literal> sets the timeout timer used by the method,
+ this applies to all things including connection timeout and data timeout.</para>
+-->
+ <para><literal>timeout</literal> オプションは、
+ この方法でのタイムアウトまでの時間を設定します。
+ これには、接続のタイムアウトとデータのタイムアウトが含まれています。</para>
+
+<!--
+ <para>One setting is provided to control the pipeline depth in cases where the
+ remote server is not RFC conforming or buggy (such as Squid 2.0.2)
+ <literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5
+ indicating how many outstanding requests APT should send. A value of
+ zero MUST be specified if the remote host does not properly linger
+ on TCP connections - otherwise data corruption will occur. Hosts which
+ require this are in violation of RFC 2068.</para></listitem>
+-->
+ <para>リモートサーバが RFC 準拠でなかったり、
+ (Squid 2.0.2 のように) バグがあったりしたときのために、
+ パイプラインの深さの制御を設定します。
+ <literal>Acquire::http::Pipeline-Depth</literal> により、
+ APT が送信できるリクエストの回数を 0 から 5 の値で設定できます。
+ リモートサーバが適切でなく、TCP 接続に時間がかかるときは、
+ <emphasis>必ず</emphasis> 0 の値を設定しなければなりません。
+ そうでなければデータが破損してしまいます。
+ これが必要なホストは RFC 2068 に違反しています。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ftp</term>
+<!--
+ <listitem><para>FTP URIs; ftp::Proxy is the default proxy server to use. It is in the
+ standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and is
+ overridden by the <envar>ftp_proxy</envar> environment variable. To use a ftp
+ proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in the
+ configuration file. This entry specifies the commands to send to tell
+ the proxy server what to connect to. Please see
+ &configureindex; for an example of
+ how to do this. The subsitution variables available are
+ <literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal>
+ <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>
+ Each is taken from it's respective URI component.</para>
+-->
+ <listitem><para>FTP URI - ftp::Proxy は、デフォルトで使用するプロキシサーバです。
+ <literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準形で表しますが、
+ 環境変数 <envar>ftp_proxy</envar> で上書きされます。
+ ftp プロキシを使用するには、設定ファイルに <literal>ftp::ProxyLogin</literal>
+ スクリプトを設定する必要があります。
+ プロキシサーバに送信する接続コマンドを、このエントリに設定します。
+ どのようにするのかは &configureindex; の例を参照してください。
+ その他にも、<literal>$(PROXY_USER)</literal>
+ <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal>
+ <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal>
+ <literal>$(SITE_PORT)</literal> が利用可能です。
+ いずれも、それぞれ URI を構成するトークンです。</para>
+
+<!--
+ <para>The option <literal>timeout</literal> sets the timeout timer used by the method,
+ this applies to all things including connection timeout and data timeout.</para>
+-->
+ <para><literal>timeout</literal> オプションは、
+ この方法でのタイムアウトまでの時間を設定します。
+ これには、接続のタイムアウトとデータのタイムアウトが含まれています。</para>
+
+<!--
+ <para>Several settings are provided to control passive mode. Generally it is
+ safe to leave passive mode on, it works in nearly every environment.
+ However some situations require that passive mode be disabled and port
+ mode ftp used instead. This can be done globally, for connections that
+ go through a proxy or for a specific host (See the sample config file
+ for examples).</para>
+-->
+ <para>設定のいくつかは、パッシブモードを制御するものです。
+ 一般的に、パッシブモードのままにしておく方が安全で、
+ ほぼどんな環境でも動作します。
+ しかしある状況下では、パッシブモードが無効のため、
+ 代わりにポートモード ftp を使用する必要があります。
+ この設定は、プロキシを通る接続や特定のホストへの接続全般に有効です。
+ (設定例はサンプル設定ファイルを参照してください)</para>
+
+<!--
+ <para>It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</envar>
+ environment variable to a http url - see the discussion of the http method
+ above for syntax. You cannot set this in the configuration file and it is
+ not recommended to use FTP over HTTP due to its low efficiency.</para>
+-->
+ <para>環境変数 <envar>ftp_proxy</envar> の http url により
+ FTP over HTTP のプロキシが利用可能になります。
+ 文法は上の http についての説明を参照してください。
+ 設定ファイルの中でこれをセットすることはできません。
+ また、効率が悪いため FTP over HTTP を使用するのは推奨しません。</para>
+
+<!--
+ <para>The setting <literal>ForceExtended</literal> controls the use of RFC2428
+ <literal>EPSV</literal> and <literal>EPRT</literal> commands. The defaut is false, which means
+ these commands are only used if the control connection is IPv6. Setting this
+ to true forces their use even on IPv4 connections. Note that most FTP servers
+ do not support RFC2428.</para></listitem>
+-->
+ <para><literal>ForceExtended</literal> の設定は RFC2428 の
+ <literal>EPSV</literal> コマンドと <literal>EPRT</literal>
+ コマンドの使用を制御します。デフォルトでは false です。
+ これは、コントロールコネクションが IPv6 の時にのみ、
+ このコマンドを使用するということです。
+ これを true にセットすると、IPv4 コネクションでも強制的に、
+ このコマンドを使用します。
+ 注) ほとんどの FTP サーバは RFC2428 をサポートしていません。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>cdrom</term>
+<!--
+ <listitem><para>CDROM URIs; the only setting for CDROM URIs is the mount point,
+ <literal>cdrom::Mount</literal> which must be the mount point for the CDROM drive
+ as specified in <filename>/etc/fstab</filename>. It is possible to provide
+ alternate mount and unmount commands if your mount point cannot be listed
+ in the fstab (such as an SMB mount and old mount packages). The syntax
+ is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within
+ the cdrom block. It is important to have the trailing slash. Unmount
+ commands can be specified using UMount.</para></listitem>
+-->
+ <listitem><para>CDROM URI - マウントポイントの設定のみを行います。
+ <filename>/etc/fstab</filename> で設定されているように、
+ CDROM ドライブのマウントポイントを
+ <literal>cdrom::Mount</literal> に設定しなければなりません。
+ (SMB マウントや古い mount パッケージなど) マウントポイントが fstab
+ に記述できない場合、かわりにマウント・アンマウントコマンドも使用できます。
+ 文法は、cdrom ブロックを
+ <literallayout>"/cdrom/"::Mount "foo";</literallayout> の形で記述します。
+ スラッシュを後につけるのは重要です。
+ アンマウントコマンドは UMount で指定することができます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>gpgv</term>
+<!--
+ <listitem><para>GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv.
+ <literal>gpgv::Options</literal> Additional options passed to gpgv.
+ </para></listitem>
+-->
+ <listitem><para>GPGV URI - GPGV URI 用の唯一のオプションは、
+ gpgv に渡す追加パラメータのオプションです。
+ <literal>gpgv::Options</literal> gpgv に渡す追加オプション。
+ </para></listitem>
+ </varlistentry>
+
+ </variablelist>
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Directories</title>
+-->
+ <refsect1><title>ディレクトリ</title>
+
+<!--
+ <para>The <literal>Dir::State</literal> section has directories that pertain to local
+ state information. <literal>lists</literal> is the directory to place downloaded
+ package lists in and <literal>status</literal> is the name of the dpkg status file.
+ <literal>preferences</literal> is the name of the APT preferences file.
+ <literal>Dir::State</literal> contains the default directory to prefix on all sub
+ items if they do not start with <filename>/</filename> or <filename>./</filename>.</para>
+-->
+ <para><literal>Dir::State</literal> セクションは、
+ ローカル状態情報に関するディレクトリを保持します。
+ <literal>lists</literal> は、
+ ダウンロードしたパッケージ一覧を格納するディレクトリで、
+ <literal>status</literal> は dpkg の状態ファイルの名前を表します。
+ <literal>preferences</literal> は APT の 設定ファイルの名前です。
+ <literal>Dir::State</literal> には、
+ <filename>/</filename> や <filename>./</filename> で始まらない
+ 全サブアイテムに付加する、デフォルトディレクトリを含んでいます。</para>
+
+<!--
+ <para><literal>Dir::Cache</literal> contains locations pertaining to local cache
+ information, such as the two package caches <literal>srcpkgcache</literal> and
+ <literal>pkgcache</literal> as well as the location to place downloaded archives,
+ <literal>Dir::Cache::archives</literal>. Generation of caches can be turned off
+ by setting their names to be blank. This will slow down startup but
+ save disk space. It is probably prefered to turn off the pkgcache rather
+ than the srcpkgcache. Like <literal>Dir::State</literal> the default
+ directory is contained in <literal>Dir::Cache</literal></para>
+-->
+ <para><literal>Dir::Cache</literal> は、
+ ローカルキャッシュ情報に関する場所を格納しています。これは、
+ ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::archives</literal>
+ と同様に、<literal>srcpkgcache</literal> と <literal>pkgcache</literal>
+ のパッケージキャッシュの場所となります。
+ それぞれを空にセットすることで、キャッシュの生成を無効にできます。
+ おそらく、srcpkgcache よりも pkgcache を無効にすることが多いと思います。
+ <literal>Dir::State</literal> と同様、<literal>Dir::Cache</literal>
+ はデフォルトディレクトリを含んでいます。</para>
+
+<!--
+ <para><literal>Dir::Etc</literal> contains the location of configuration files,
+ <literal>sourcelist</literal> gives the location of the sourcelist and
+ <literal>main</literal> is the default configuration file (setting has no effect,
+ unless it is done from the config file specified by
+ <envar>APT_CONFIG</envar>).</para>
+-->
+ <para><literal>Dir::Etc</literal> は設定ファイルの場所を格納しています。
+ <literal>sourcelist</literal> はソースリストの場所を示し、
+ <literal>main</literal> はデフォルトの設定ファイルです。
+ (<envar>APT_CONFIG</envar> で設定ファイルを指定された場合のみ、
+ この設定の効果があります)</para>
+
+<!--
+ <para>The <literal>Dir::Parts</literal> setting reads in all the config fragments in
+ lexical order from the directory specified. After this is done then the
+ main config file is loaded.</para>
+-->
+ <para><literal>Dir::Parts</literal> 設定は、指定されたディレクトリから、
+ 字句単位の全ての設定断片を読みこみます。
+ これを設定した後に、メイン設定ファイルをロードします。</para>
+
+<!--
+ <para>Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal>
+ specifies the location of the method handlers and <literal>gzip</literal>,
+ <literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</literal>
+ <literal>dpkg-buildpackage</literal> and <literal>apt-cache</literal> specify the location
+ of the respective programs.</para>
+-->
+ <para>バイナリプログラムは <literal>Dir::Bin</literal> で指定します。
+ <literal>Dir::Bin::Methods</literal> はメソッドハンドラの場所を指定し、
+ <literal>gzip</literal>, <literal>dpkg</literal>,
+ <literal>apt-get</literal>, <literal>dpkg-source</literal>,
+ <literal>dpkg-buildpackage</literal>, <literal>apt-cache</literal>
+ はそれぞれプログラムの場所を指定します。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>APT in DSelect</title>
+-->
+ <refsect1><title>DSelect での APT</title>
+<!--
+ <para>
+ When APT is used as a &dselect; method several configuration directives
+ control the default behaviour. These are in the <literal>DSelect</literal> section.</para>
+-->
+ <para>
+ &dselect; 上で APT を使用する際、
+ <literal>DSelect</literal> セクション以下の設定項目で、
+ デフォルトの動作を制御します。</para>
+ <variablelist>
+ <varlistentry><term>Clean</term>
+<!--
+ <listitem><para>Cache Clean mode; this value may be one of always, prompt, auto,
+ pre-auto and never. always and prompt will remove all packages from
+ the cache after upgrading, prompt (the default) does so conditionally.
+ auto removes only those packages which are no longer downloadable
+ (replaced with a new version for instance). pre-auto performs this
+ action before downloading new packages.</para></listitem>
+-->
+ <listitem><para>キャッシュクリーンモード -
+ この値は always, prompt, auto, pre-auto, never のうちひとつを取ります。
+ always と prompt は更新後、全パッケージをキャッシュから削除します。
+ (デフォルトの) prompt では条件付きで削除します。
+ auto はダウンロード不能パッケージ (例えば新バージョンで置き換えられたもの)
+ を削除します。pre-auto はこの動作を、
+ 新パッケージをダウンロードする直前に行います。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>options</term>
+<!--
+ <listitem><para>The contents of this variable is passed to &apt-get; as command line
+ options when it is run for the install phase.</para></listitem>
+-->
+ <listitem><para>この変数の内容は、
+ install 時のコマンドラインオプションと同様に &apt-get; に渡されます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Updateoptions</term>
+<!--
+ <listitem><para>The contents of this variable is passed to &apt-get; as command line
+ options when it is run for the update phase.</para></listitem>
+-->
+ <listitem><para>この変数の内容は、
+ update 時のコマンドラインオプションと同様に &apt-get; に渡されます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>PromptAfterUpdate</term>
+<!--
+ <listitem><para>If true the [U]pdate operation in &dselect; will always prompt to continue.
+ The default is to prompt only on error.</para></listitem>
+-->
+ <listitem><para>true の場合、
+ &dselect; の [U]pdate 実行時に、続行のためのプロンプトを毎回表示します。
+ デフォルトはエラーが発生した場合のみです。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>How APT calls dpkg</title>
+-->
+ <refsect1><title>APT が dpkg を呼ぶ方法</title>
+<!--
+ <para>Several configuration directives control how APT invokes &dpkg;. These are
+ in the <literal>DPkg</literal> section.</para>
+-->
+ <para>数種の設定項目で APT がどのように &dpkg; を呼び出すかを制御できます。
+ <literal>DPkg</literal> セクションにあります。</para>
+
+ <variablelist>
+ <varlistentry><term>options</term>
+<!--
+ <listitem><para>This is a list of options to pass to dpkg. The options must be specified
+ using the list notation and each list item is passed as a single argument
+ to &dpkg;.</para></listitem>
+-->
+ <listitem><para>dpkg に渡すオプションのリストです。
+ オプションは、リスト記法を使用して指定しなければなりません。
+ また、各リストは単一の引数として &dpkg; に渡されます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Pre-Invoke</term><term>Post-Invoke</term>
+<!--
+ <listitem><para>This is a list of shell commands to run before/after invoking &dpkg;.
+ Like <literal>options</literal> this must be specified in list notation. The
+ commands are invoked in order using <filename>/bin/sh</filename>, should any
+ fail APT will abort.</para></listitem>
+-->
+ <listitem><para>&dpkg; を呼び出す前後で実行するシェルコマンドのリストです。
+ <literal>options</literal> のようにリスト記法で指定しなければなりません。
+ コマンドは <filename>/bin/sh</filename> を使用して呼び出され、
+ 何か問題があれば、APT は異常終了します。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Pre-Install-Pkgs</term>
+<!--
+ <listitem><para>This is a list of shell commands to run before invoking dpkg. Like
+ <literal>options</literal> this must be specified in list notation. The commands
+ are invoked in order using <filename>/bin/sh</filename>, should any fail APT
+ will abort. APT will pass to the commands on standard input the
+ filenames of all .deb files it is going to install, one per line.</para>
+-->
+ <listitem><para>&dpkg; を呼び出す前に実行するシェルコマンドのリストです。
+ <literal>options</literal> のようにリスト記法で指定しなければなりません。
+ コマンドは <filename>/bin/sh</filename> を通して呼び出され、
+ 何か問題があれば、APT は異常終了します。
+ APT はインストールしようとする全 .deb ファイルのファイル名を、
+ ひとつずつコマンドの標準入力に送ります。</para>
+
+<!--
+ <para>Version 2 of this protocol dumps more information, including the
+ protocol version, the APT configuration space and the packages, files
+ and versions being changed. Version 2 is enabled by setting
+ <literal>DPkg::Tools::options::cmd::Version</literal> to 2. <literal>cmd</literal> is a
+ command given to <literal>Pre-Install-Pkgs</literal>.</para></listitem>
+-->
+ <para>このプロトコルのバージョン 2 では、(プロトコルのバージョンや
+ APT 設定スペース、パッケージを含む) 詳細情報やファイル、
+ 変更されているバージョンを出力します。
+ <literal>DPkg::Tools::options::cmd::Version</literal> に 2 を設定すると、
+ バージョン 2 を有効にできます。
+ <literal>cmd</literal> は <literal>Pre-Install-Pkgs</literal>
+ で与えられるコマンドです。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Run-Directory</term>
+<!--
+ <listitem><para>APT chdirs to this directory before invoking dpkg, the default is
+ <filename>/</filename>.</para></listitem>
+-->
+ <listitem><para>APT は dpkg を呼び出す前にこのディレクトリに移動します。
+ デフォルトは <filename>/</filename> です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>Build-options</term>
+<!--
+ <listitem><para>These options are passed to &dpkg-buildpackage; when compiling packages,
+ the default is to disable signing and produce all binaries.</para></listitem>
+-->
+ <listitem><para>これらのオプションは、
+ パッケージのコンパイル時に &dpkg-buildpackage; に渡されます。
+ デフォルトでは、署名を無効にし、全バイナリを生成します。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>Debug options</title>
+-->
+ <refsect1><title>デバッグオプション</title>
+<!--
+ <para>Most of the options in the <literal>debug</literal> section are not interesting to
+ the normal user, however <literal>Debug::pkgProblemResolver</literal> shows
+ interesting output about the decisions dist-upgrade makes.
+ <literal>Debug::NoLocking</literal> disables file locking so APT can do some
+ operations as non-root and <literal>Debug::pkgDPkgPM</literal> will print out the
+ command line for each dpkg invokation. <literal>Debug::IdentCdrom</literal> will
+ disable the inclusion of statfs data in CDROM IDs.
+ <literal>Debug::Acquire::gpgv</literal> Debugging of the gpgv method.
+ </para>
+-->
+ <para><literal>debug</literal> の多くのオプションは、
+ 普通のユーザにとって興味を引くものではありません。
+ しかし <literal>Debug::pkgProblemResolver</literal> で、
+ dist-upgrade の判断についての興味深い出力が得られます。
+ <literal>Debug::NoLocking</literal>は、
+ APT が非 root で操作できるようにファイルのロックを無効にしますし、
+ <literal>Debug::pkgDPkgPM</literal>は、
+ dpkg を呼ぶ際のコマンドラインを出力します。
+ <literal>Debug::IdentCdrom</literal> は、
+ CDROM ID の状態データの包含を無効にします。
+ <literal>Debug::Acquire::gpgv</literal> gpgv 法のデバッグです。
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Examples</title>
+-->
+ <refsect1><title>例</title>
+<!--
+ <para>&configureindex; is a
+ configuration file showing example values for all possible
+ options.</para>
+-->
+ <para>&configureindex; に、全利用可能オプションのデフォルト値を参照できる、
+ 設定ファイルのサンプルがあります。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+ <para><filename>/etc/apt/apt.conf</filename></para>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;.</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja
index 495322997..3fa931ae5 100644
--- a/doc/ja/apt.ent.ja
+++ b/doc/ja/apt.ent.ja
@@ -2,178 +2,327 @@
<!-- Some common paths.. -->
<!ENTITY docdir "/usr/share/doc/apt/">
-<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</>">
-<!ENTITY aptconfdir "<filename>/etc/apt.conf</>">
+<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
+<!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
<!ENTITY statedir "/var/lib/apt">
<!ENTITY cachedir "/var/cache/apt">
<!-- Cross references to other man pages -->
-<!ENTITY apt-conf "<CiteRefEntry>
- <RefEntryTitle><filename/apt.conf/</RefEntryTitle>
- <ManVolNum/5/
- </CiteRefEntry>">
-
-<!ENTITY apt-get "<CiteRefEntry>
- <RefEntryTitle><command/apt-get/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY apt-config "<CiteRefEntry>
- <RefEntryTitle><command/apt-config/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY apt-cdrom "<CiteRefEntry>
- <RefEntryTitle><command/apt-cdrom/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY apt-cache "<CiteRefEntry>
- <RefEntryTitle><command/apt-cache/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY apt-preferences "<CiteRefEntry>
- <RefEntryTitle><command/apt_preferences/</RefEntryTitle>
- <ManVolNum/5/
- </CiteRefEntry>">
-
-<!ENTITY sources-list "<CiteRefEntry>
- <RefEntryTitle><filename/sources.list/</RefEntryTitle>
- <ManVolNum/5/
- </CiteRefEntry>">
-
-<!ENTITY reportbug "<CiteRefEntry>
- <RefEntryTitle><command/reportbug/</RefEntryTitle>
- <ManVolNum/1/
- </CiteRefEntry>">
-
-<!ENTITY dpkg "<CiteRefEntry>
- <RefEntryTitle><command/dpkg/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY dpkg-buildpackage "<CiteRefEntry>
- <RefEntryTitle><command/dpkg-buildpackage/</RefEntryTitle>
- <ManVolNum/1/
- </CiteRefEntry>">
-
-<!ENTITY gzip "<CiteRefEntry>
- <RefEntryTitle><command/gzip/</RefEntryTitle>
- <ManVolNum/1/
- </CiteRefEntry>">
-
-<!ENTITY dpkg-scanpackages "<CiteRefEntry>
- <RefEntryTitle><command/dpkg-scanpackages/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY dpkg-scansources "<CiteRefEntry>
- <RefEntryTitle><command/dpkg-scansources/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
-
-<!ENTITY dselect "<CiteRefEntry>
- <RefEntryTitle><command/dselect/</RefEntryTitle>
- <ManVolNum/8/
- </CiteRefEntry>">
+<!ENTITY apt-conf "<citerefentry>
+ <refentrytitle><filename>apt.conf</filename></refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-get "<citerefentry>
+ <refentrytitle><command>apt-get</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-config "<citerefentry>
+ <refentrytitle><command>apt-config</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-cdrom "<citerefentry>
+ <refentrytitle><command>apt-cdrom</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-cache "<citerefentry>
+ <refentrytitle><command>apt-cache</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-preferences "<citerefentry>
+ <refentrytitle><command>apt_preferences</command></refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-key "<citerefentry>
+ <refentrytitle><command>apt-key</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-secure "<citerefentry>
+ <refentrytitle>apt-secure</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY apt-archive "<citerefentry>
+ <refentrytitle><filename>apt-archive</filename></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+
+<!ENTITY sources-list "<citerefentry>
+ <refentrytitle><filename>sources.list</filename></refentrytitle>
+ <manvolnum>5</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY reportbug "<citerefentry>
+ <refentrytitle><command>reportbug</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dpkg "<citerefentry>
+ <refentrytitle><command>dpkg</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dpkg-buildpackage "<citerefentry>
+ <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY gzip "<citerefentry>
+ <refentrytitle><command>gzip</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dpkg-scanpackages "<citerefentry>
+ <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dpkg-scansources "<citerefentry>
+ <refentrytitle><command>dpkg-scansources</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY dselect "<citerefentry>
+ <refentrytitle><command>dselect</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY aptitude "<citerefentry>
+ <refentrytitle><command>aptitude</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY synaptic "<citerefentry>
+ <refentrytitle><command>synaptic</command></refentrytitle>
+ <manvolnum>8</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY debsign "<citerefentry>
+ <refentrytitle><command>debsign</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY debsig-verify "<citerefentry>
+ <refentrytitle><command>debsig-verify</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
+
+<!ENTITY gpg "<citerefentry>
+ <refentrytitle><command>gpg</command></refentrytitle>
+ <manvolnum>1</manvolnum>
+ </citerefentry>"
+>
<!-- Boiler plate docinfo section -->
<!ENTITY apt-docinfo "
- <docinfo>
- <address><email>apt@packages.debian.org</></address>
- <author><firstname>Jason</> <surname>Gunthorpe</></>
- <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>
- <date>12 March 2001</>
- </docinfo>
+ <refentryinfo>
+ <address><email>apt@packages.debian.org</email></address>
+ <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
+ <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
+ <date>14 December 2003</date>
+ <productname>Linux</productname>
+
+ </refentryinfo>
">
+<!ENTITY apt-email "
+ <address>
+ <email>apt@packages.debian.org</email>
+ </address>
+">
+
+<!ENTITY apt-author.jgunthorpe "
+ <author>
+ <firstname>Jason</firstname>
+ <surname>Gunthorpe</surname>
+ </author>
+">
+
+<!ENTITY apt-author.team "
+ <author>
+ <othername>APT team</othername>
+ </author>
+">
+
+<!ENTITY apt-product "
+ <productname>Linux</productname>
+">
+
+<!ENTITY apt-email "
+ <address>
+ <email>apt@packages.debian.org</email>
+ </address>
+">
+
+<!ENTITY apt-author.jgunthorpe "
+ <author>
+ <firstname>Jason</firstname>
+ <surname>Gunthorpe</surname>
+ </author>
+">
+
+<!ENTITY apt-author.team "
+ <author>
+ <othername>APT team</othername>
+ </author>
+">
+
+<!ENTITY apt-copyright "
+ <copyright>
+ <holder>Jason Gunthorpe</holder>
+ <year>1998-2001</year>
+ </copyright>
+">
+
+<!ENTITY apt-product "
+ <productname>Linux</productname>
+">
+
<!-- Boiler plate Bug reporting section -->
<!ENTITY manbugs "
- <RefSect1><Title>Х</>
- <para>
- <ulink url='http://bugs.debian.org/apt'>APT Хڡ</>
- ȤƤ
- APT ΥХ𤹤ϡ
- <filename>/usr/share/doc/debian/bug-reporting.txt</>
- &reportbug; ޥɤ򻲾ȤƤ
+<!--
+ <refsect1><title>Bugs</title>
+-->
+ <refsect1><title>バグ</title>
+<!--
+ <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>.
+ If you wish to report a bug in APT, please see
+ <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the
+ &reportbug; command.
</para>
- </RefSect1>
+-->
+ <para><ulink url='http://bugs.debian.org/src:apt'>APT バグページ</ulink>を
+ ご覧ください。
+ APT のバグを報告する場合は、
+ <filename>/usr/share/doc/debian/bug-reporting.txt</filename> や
+ &reportbug; コマンドをご覧ください。
+ </para>
+ </refsect1>
">
<!-- Boiler plate Author section -->
<!ENTITY manauthor "
- <RefSect1><Title></>
- <para>
- APT the APT team <email>apt@packages.debian.org</> ˤäƽ񤫤ޤ
+<!--
+ <refsect1><title>Author</title>
+-->
+ <refsect1><title>著者</title>
+<!--
+ <para>APT was written by the APT team <email>apt@packages.debian.org</email>.
+-->
+ <para>APT は the APT team <email>apt@packages.debian.org</email> によって
+ 書かれました。
</para>
- </RefSect1>
+ </refsect1>
">
-<!-- Translator section (Kurasawa Add)-->
+<!-- Boiler plate Translator section (nabetaro add)-->
<!ENTITY translator "
- <RefSect1><Title></>
- <para>
- ߷ ˾ <email>nabetaro@mx1.avis.ne.jp</> (2003-2004)
- </para>
- <para>
- Debian JP Documentation ML <email>debian-doc@debian.or.jp</>
- </para>
- </RefSect1>
+ <refsect1><title>訳者</title>
+ <para>倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006),
+ Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>
+ </para>
+ </refsect1>
">
<!-- Should be used within the option section of the text to
put in the blurb about -h, -v, -c and -o -->
<!ENTITY apt-commonoptions "
- <VarListEntry><term><option/-h/</><term><option/--help/</>
- <ListItem><Para>
- Ȥûɽޤ
- </Para></ListItem>
- </VarListEntry>
+ <varlistentry><term><option>-h</option></term>
+ <term><option>--help</option></term>
+<!--
+ <listitem><para>Show a short usage summary.
+-->
+ <listitem><para>使い方の短い要約を表示します。
+ </para>
+ </listitem>
+ </varlistentry>
- <VarListEntry><term><option/-v/</><term><option/--version/</>
- <ListItem><Para>
- ץΥСɽޤ
- </Para></ListItem>
- </VarListEntry>
-
- <VarListEntry><term><option/-c/</><term><option/--config-file/</>
- <ListItem><Para>
+ <varlistentry>
+ <term><option>-v</option></term>
+ <term><option>--version</option></term>
<!--
- Configuration File; Specify a configuration file to use.
+ <listitem><para>Show the program version.
+-->
+ <listitem><para>プログラムのバージョンを表示します。
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-c</option></term>
+ <term><option>--config-file</option></term>
+<!--
+ <listitem><para>Configuration File; Specify a configuration file to use.
The program will read the default configuration file and then this
configuration file. See &apt-conf; for syntax information.
+ </para>
-->
- ե롣 Ѥեꤷޤ
- ե뤬ɤʤϥǥեȤեɤ߹ߤޤ
- ʸˡξ &apt-conf; 򻲾ȤƤ
- </Para></ListItem>
- </VarListEntry>
+ <listitem><para>設定ファイル。 使用する設定ファイルを指定します。
+ この設定ファイルが読めない場合はデフォルトの設定ファイルを読み込みます。
+ 文法については &apt-conf; を参照してください。
+ </para>
+ </listitem>
+ </varlistentry>
- <VarListEntry><term><option/-o/</><term><option/--option/</>
- <ListItem><Para>
+ <varlistentry>
+ <term><option>-o</option></term>
+ <term><option>--option</option></term>
<!--
- Set a Configuration Option; This will set an arbitary configuration
- option. The syntax is <option>-o Foo::Bar=bar</>.
+ <listitem><para>Set a Configuration Option; This will set an arbitary
+ configuration option. The syntax is <option>-o Foo::Bar=bar</option>.
+ </para>
-->
- ꥪץΥå - Ǥդꥪץ򥻥åȤޤ
- ʸˡ <option>-o Foo::Bar=bar</> Ȥʤޤ
- </Para></ListItem>
- </VarListEntry>
+ <listitem><para>設定オプションのセット。任意の設定オプションをセットします。
+ 文法は <option>-o Foo::Bar=bar</option> となります。
+ </para>
+ </listitem>
+ </varlistentry>
">
<!-- Should be used within the option section of the text to
put in the blurb about -h, -v, -c and -o -->
<!ENTITY apt-cmdblurb "
- <para>
<!--
- All command line options may be set using the configuration file, the
+ <para>All command line options may be set using the configuration file, the
descriptions indicate the configuration option to set. For boolean
options you can override the config file by using something like
- <option/-f-/,<option/- -no-f/, <option/-f=no/ or several other variations.
+ <option>-f-</option>,<option>-\-no-f</option>, <option>-f=no</option>
+ or several other variations.
+ </para>
-->
- Ǽץϡ٤եѤǤޤ
- ե˽񤤤ͤȤ륪ץ <option/-f-/,<option/--no-f/,
- <option/-f=no/ ʤɤΤ褦ˤƾ񤭤뤳ȤǤޤ
+ <para>この説明で示したオプションは、
+ すべて設定ファイルを使用して設定できます。
+ 設定ファイルに書いた真偽値をとるオプションは
+ <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>
+ などのようにして上書きできます。
</para>
">
+
diff --git a/doc/ja/apt_preferences.ja.5.xml b/doc/ja/apt_preferences.ja.5.xml
new file mode 100644
index 000000000..a7e63a961
--- /dev/null
+++ b/doc/ja/apt_preferences.ja.5.xml
@@ -0,0 +1,940 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>apt_preferences</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>apt_preferences</refname>
+<!--
+ <refpurpose>Preference control file for APT</refpurpose>
+-->
+ <refpurpose>APT 設定制御ファイル</refpurpose>
+ </refnamediv>
+
+<refsect1>
+<!--
+<title>Description</title>
+-->
+<title>説明</title>
+<!--
+<para>The APT preferences file <filename>/etc/apt/preferences</filename>
+can be used to control which versions of packages will be selected
+for installation.</para>
+-->
+<para>APT 設定ファイル <filename>/etc/apt/preferences</filename> は、
+インストールするパッケージのバージョン選択を制御するのに使用します。</para>
+
+<!--
+<para>Several versions of a package may be available for installation when
+the &sources-list; file contains references to more than one distribution
+(for example, <literal>stable</literal> and <literal>testing</literal>).
+APT assigns a priority to each version that is available.
+Subject to dependency constraints, <command>apt-get</command> selects the
+version with the highest priority for installation.
+The APT preferences file overrides the priorities that APT assigns to
+package versions by default, thus giving the user control over which
+one is selected for installation.</para>
+-->
+<para>&sources-list; ファイルに複数のディストリビューション
+(<literal>stable</literal> と <literal>testing</literal> など)
+が指定されていて、
+パッケージに対し複数のバージョンがインストールできることがあります。
+このとき APT は、利用できるバージョンごとに優先度を割り当てます。
+依存関係規則を条件として、<command>apt-get</command> は、
+最も高い優先度を持つバージョンをインストールするよう選択します。
+APT 設定ファイルは、APT がデフォルトで割り当てた、
+パッケージのバージョンの優先度を上書きします。
+その結果、インストールするものの選択を、ユーザが選択できるようになります。</para>
+
+<!--
+<para>Several instances of the same version of a package may be available when
+the &sources-list; file contains references to more than one source.
+In this case <command>apt-get</command> downloads the instance listed
+earliest in the &sources-list; file.
+The APT preferences file does not affect the choice of instance, only
+the choice of version.</para>
+-->
+<para>&sources-list; ファイルに複数の参照が書かれている場合、
+パッケージの同じバージョンのインスタンスが複数利用できる可能性があります。
+この場合、<command>apt-get</command> は &sources-list;
+ファイルの初めの方に指定されているところからダウンロードします。
+APT 設定ファイルは、バージョンの選択にのみ影響し、
+インスタンスの選択には影響しません。</para>
+
+<!--
+<refsect2><title>APT's Default Priority Assignments</title>
+-->
+<refsect2><title>APT のデフォルト優先度の割り当て</title>
+
+<!--
+<para>If there is no preferences file or if there is no entry in the file
+that applies to a particular version then the priority assigned to that
+version is the priority of the distribution to which that version
+belongs. It is possible to single out a distribution, "the target release",
+which receives a higher priority than other distributions do by default.
+The target release can be set on the <command>apt-get</command> command
+line or in the APT configuration file <filename>/etc/apt/apt.conf</filename>.
+For example,
+-->
+<para>設定ファイルがなかったり、
+設定ファイルに、特定のパッケージを割り当てるエントリがない場合、
+そのバージョンの優先度は、
+そのバージョンが属しているディストリビューションの優先度となります。
+デフォルトで他のディストリビューションより高い優先度を持つ、
+特定のディストリビューションを「ターゲットリリース」としておくのは可能です。
+ターゲットリリースは、<command>apt-get</command> のコマンドラインで設定したり、
+APT 設定ファイル <filename>/etc/apt/apt.conf</filename> で設定したりできます。
+例えば以下のようになります。
+
+<programlisting>
+<command>apt-get install -t testing <replaceable>some-package</replaceable></command>
+</programlisting>
+<programlisting>
+APT::Default-Release "stable";
+</programlisting>
+</para>
+
+<!--
+<para>If the target release has been specified then APT uses the following
+algorithm to set the priorities of the versions of a package. Assign:
+-->
+<para>ターゲットリリースが指定されると、APT は以下のアルゴリズムで、
+パッケージのバージョンの優先度を設定します。このように割り当てます。
+
+<variablelist>
+<varlistentry>
+<!--
+<term>priority 100</term>
+-->
+<term>優先度 100</term>
+<!--
+<listitem><simpara>to the version that is already installed (if any).</simpara></listitem>
+-->
+<listitem><simpara>(あるならば) 既にインストールされているバージョン。</simpara></listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>priority 500</term>
+-->
+<term>優先度 500</term>
+<!--
+<listitem><simpara>to the versions that are not installed and do not belong to the target release.</simpara></listitem>
+-->
+<listitem><simpara>インストールされておらず、ターゲットリリースに含まれないバージョン。</simpara></listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>priority 990</term>
+-->
+<term>優先度 990</term>
+<!--
+<listitem><simpara>to the versions that are not installed and belong to the target release.</simpara></listitem>
+-->
+<listitem><simpara>インストールされておらず、ターゲットリリースに含まれるバージョン。</simpara></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>If the target release has not been specified then APT simply assigns
+priority 100 to all installed package versions and priority 500 to all
+uninstalled package versions.</para>
+-->
+<para>ターゲットリリースが指定されていなければ、
+APT は単純にインストールしているパッケージのバージョンには 100 を、
+インストールしていないパッケージのバージョンには 500 を割り当てます。</para>
+
+<!--
+<para>APT then applies the following rules, listed in order of precedence,
+to determine which version of a package to install.
+-->
+<para>APT は、インストールするパッケージのバージョンを決定するために、
+以下のルールを上から順番に適用します。
+<itemizedlist>
+<!--
+<listitem><simpara>Never downgrade unless the priority of an available
+version exceeds 1000. ("Downgrading" is installing a less recent version
+of a package in place of a more recent version. Note that none of APT's
+default priorities exceeds 1000; such high priorities can only be set in
+the preferences file. Note also that downgrading a package
+can be risky.)</simpara></listitem>
+-->
+<listitem><simpara>有効なバージョンの優先度が 1000 を越えない場合、
+決してダウングレードしません。
+(「ダウングレード」は、現在のパッケージのバージョンよりも、
+小さいバージョンのものをインストールします。
+APT のデフォルト優先度が 1000 を越えないことに注意してください。
+そのような優先度は設定ファイルでのみ設定できます。
+また、パッケージのダウングレードは危険であることにも注意してください)</simpara></listitem>
+<!--
+<listitem><simpara>Install the highest priority version.</simpara></listitem>
+-->
+<listitem><simpara>最も高い優先度のバージョンをインストールします。</simpara></listitem>
+<!--
+<listitem><simpara>If two or more versions have the same priority,
+install the most recent one (that is, the one with the higher version
+number).</simpara></listitem>
+-->
+<listitem><simpara>同じ優先度のバージョンが複数存在する場合、
+最も新しいもの (最もバージョン番号が高いもの) をインストールします。</simpara></listitem>
+<!--
+<listitem><simpara>If two or more versions have the same priority and
+version number but either the packages differ in some of their metadata or the
+<literal>-\-reinstall</literal> option is given, install the uninstalled one.</simpara></listitem>
+-->
+<listitem><simpara>優先度・バージョン番号が同じものが複数存在し、
+そのパッケージのメタデータが異なるか <literal>--reinstall</literal>
+オプションが与えられている場合、
+インストールされていないものをインストールします。</simpara></listitem>
+</itemizedlist>
+</para>
+
+<!--
+<para>In a typical situation, the installed version of a package (priority 100)
+is not as recent as one of the versions available from the sources listed in
+the &sources-list; file (priority 500 or 990). Then the package will be upgraded
+when <command>apt-get install <replaceable>some-package</replaceable></command>
+or <command>apt-get upgrade</command> is executed.
+-->
+<para>よくある状況として、
+あるインストールされているパッケージのバージョン (優先度 100) が、
+&sources-list; ファイルのリストから得られるバージョン (優先度 500 か 990)
+よりも新しくないということがあります。この場合、
+<command>apt-get install <replaceable>some-package</replaceable></command>
+や <command>apt-get upgrade</command> を実行するとパッケージが更新されます。
+</para>
+
+<!--
+<para>More rarely, the installed version of a package is <emphasis>more</emphasis> recent
+than any of the other available versions. The package will not be downgraded
+when <command>apt-get install <replaceable>some-package</replaceable></command>
+or <command>apt-get upgrade</command> is executed.</para>
+-->
+<para>まれに、インストールされているパッケージのバージョンが、
+<emphasis>他の有効なバージョンよりも</emphasis>新しい場合があります。
+この時
+<command>apt-get install <replaceable>some-package</replaceable></command>
+や <command>apt-get upgrade</command> を実行しても、
+ダウングレードしません。</para>
+
+<!--
+<para>Sometimes the installed version of a package is more recent than the
+version belonging to the target release, but not as recent as a version
+belonging to some other distribution. Such a package will indeed be upgraded
+when <command>apt-get install <replaceable>some-package</replaceable></command>
+or <command>apt-get upgrade</command> is executed,
+because at least <emphasis>one</emphasis> of the available versions has a higher
+priority than the installed version.</para>
+-->
+<para>時々、インストールしているパッケージのバージョンが、
+ターゲットリリースに属するバージョンよりも新しく、
+他のディストリビューションよりも古い場合があります。
+そのようなパッケージに対して
+<command>apt-get install <replaceable>some-package</replaceable></command>
+や <command>apt-get upgrade</command> を実行すると、
+パッケージは更新されます。
+この場合、インストールされているバージョンよりも、
+少なくとも<emphasis>ひとつ</emphasis>は、
+高い優先度を持つ有効なパッケージがあるからです。</para>
+</refsect2>
+
+<!--
+<refsect2><title>The Effect of APT Preferences</title>
+-->
+<refsect2><title>APT 設定の効果</title>
+
+<!--
+<para>The APT preferences file allows the system administrator to control the
+assignment of priorities. The file consists of one or more multi-line records
+separated by blank lines. Records can have one of two forms, a specific form
+and a general form.
+-->
+<para>APT 設定ファイルを使うと、
+システム管理者が優先度を割り当てられるようになります。
+ファイルは、空白行で区切られた、複数行からなるレコードで構成されています。
+レコードは特定形式か、汎用形式のどちらかの形式をとります。
+<itemizedlist>
+<listitem>
+<!--
+<simpara>The specific form assigns a priority (a "Pin-Priority") to a
+specified package and specified version or version range. For example,
+the following record assigns a high priority to all versions of
+the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>".</simpara>
+-->
+<simpara>特定形式は、優先度 ("Pin-Priority") を、
+指定したパッケージの指定したバージョン (範囲) について割り当てます。
+例えば以下のレコードは、
+"<literal>5.8</literal>" で始まる <filename>perl</filename> パッケージを、
+高い優先度に設定します。</simpara>
+
+<programlisting>
+Package: perl
+Pin: version 5.8*
+Pin-Priority: 1001
+</programlisting>
+</listitem>
+
+<!--
+<listitem><simpara>The general form assigns a priority to all of the package versions in a
+given distribution (that is, to all the versions of packages that are
+listed in a certain <filename>Release</filename> file) or to all of the package
+versions coming from a particular Internet site, as identified by the
+site's fully qualified domain name.</simpara>
+-->
+<listitem><simpara>汎用形式は、与えられたディストリビューションにある、
+すべてのパッケージ (<filename>Release</filename> ファイルに列挙したパッケージ)
+の優先度や、FQDNで指定した、
+特定のインターネットサイトから取得するパッケージの優先度を割り当てます。</simpara>
+
+<!--
+<simpara>This general-form entry in the APT preferences file applies only
+to groups of packages. For example, the following record assigns a high
+priority to all package versions available from the local site.</simpara>
+-->
+<simpara>APT 設定ファイルに書かれている汎用形式のエントリは、
+パッケージのグループについてのみ適用されます。
+例えば以下のレコードは、ローカルサイトにある全パッケージについて、
+高い優先度を割り当てます。</simpara>
+
+<programlisting>
+Package: *
+Pin: origin ""
+Pin-Priority: 999
+</programlisting>
+
+<!--
+<simpara>A note of caution: the keyword used here is "<literal>origin</literal>".
+This should not be confused with the Origin of a distribution as
+specified in a <filename>Release</filename> file. What follows the "Origin:" tag
+in a <filename>Release</filename> file is not an Internet address
+but an author or vendor name, such as "Debian" or "Ximian".</simpara>
+-->
+<simpara>注: ここで使用しているキーワードは "<literal>origin</literal>" です。
+<filename>Release</filename> ファイルに指定されたような、
+ディストリビューションの Origin と混同しないようにしてください。
+<filename>Release</filename> ファイルにある "Origin:" タグは、
+インターネットアドレスではなく、
+"Debian" や "Ximian" といった作者やベンダ名です。</simpara>
+
+<!--
+<simpara>The following record assigns a low priority to all package versions
+belonging to any distribution whose Archive name is "<literal>unstable</literal>".</simpara>
+-->
+<simpara>以下のレコードは、アーカイブ名が "<literal>unstable</literal>"
+となっているディストリビューションに属するパッケージを、
+すべて低い優先度に割り当てます。</simpara>
+
+<programlisting>
+Package: *
+Pin: release a=unstable
+Pin-Priority: 50
+</programlisting>
+
+<!--
+<simpara>The following record assigns a high priority to all package versions
+belonging to any release whose Archive name is "<literal>stable</literal>"
+and whose release Version number is "<literal>3.0</literal>".</simpara>
+-->
+<simpara>以下のレコードは、アーカイブ名が "<literal>stable</literal>" で、
+リリースバージョン番号が "<literal>3.0</literal>"
+となっているリリースに属するパッケージを、
+すべて高い優先度に割り当てます。</simpara>
+
+<programlisting>
+Package: *
+Pin: release a=stable, v=3.0
+Pin-Priority: 500
+</programlisting>
+</listitem>
+</itemizedlist>
+</para>
+
+</refsect2>
+
+<refsect2>
+<!--
+<title>How APT Interprets Priorities</title>
+-->
+<title>APT が優先度に割り込む方法</title>
+
+<para>
+<!--
+Priorities (P) assigned in the APT preferences file must be positive
+or negative integers. They are interpreted as follows (roughly speaking):
+-->
+APT 設定ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。
+これは (おおざっぱにいうと) 以下のように解釈されます。
+
+<variablelist>
+<varlistentry>
+<term>P &gt; 1000</term>
+<!--
+<listitem><simpara>causes a version to be installed even if this
+constitutes a downgrade of the package</simpara></listitem>
+-->
+<listitem><simpara>パッケージがダウングレードしても、このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>990 &lt; P &lt;=1000</term>
+<!--
+<listitem><simpara>causes a version to be installed
+even if it does not come from the target release,
+unless the installed version is more recent</simpara></listitem>
+-->
+<listitem><simpara>インストールされているバージョンの方が新しいことを除き、
+ターゲットリリースに含まれなくても、
+このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>500 &lt; P &lt;=990</term>
+<!--
+<listitem><simpara>causes a version to be installed
+unless there is a version available belonging to the target release
+or the installed version is more recent</simpara></listitem>
+-->
+<listitem><simpara>ターゲットリリースに属するバージョンがあったり、
+インストールされているバージョンの方が新しいのでなければ、
+このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>100 &lt; P &lt;=500</term>
+<!--
+<listitem><simpara>causes a version to be installed
+unless there is a version available belonging to some other
+distribution or the installed version is more recent</simpara></listitem>
+-->
+<listitem><simpara>他のディストリビューションに属するバージョンがあったり、
+インストールされているバージョンの方が新しいのでなければ、
+このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>0 &lt; P &lt;=100</term>
+<!--
+<listitem><simpara>causes a version to be installed
+only if there is no installed version of the package</simpara></listitem>
+-->
+<listitem><simpara>このパッケージがインストールされていない場合、
+このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>P &lt; 0</term>
+<!--
+<listitem><simpara>prevents the version from being installed</simpara></listitem>
+-->
+<listitem><simpara>このバージョンがインストールされないようにします。</simpara></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>If any specific-form records match an available package version then the
+first such record determines the priority of the package version.
+Failing that,
+if any general-form records match an available package version then the
+first such record determines the priority of the package version.</para>
+-->
+<para>特定形式のレコードが利用可能パッケージバージョンに一致した場合、
+最初のレコードが、パッケージバージョンの優先度を決定します。
+失敗して、汎用形式のレコードが利用可能パッケージバージョンに一致した場合、
+最初のレコードが、パッケージバージョンの優先度を決定します。</para>
+
+<!--
+<para>For example, suppose the APT preferences file contains the three
+records presented earlier:</para>
+-->
+<para>例えば、APT 設定ファイルの上の方に、
+以下のレコードが書かれていると仮定してください。</para>
+
+<programlisting>
+Package: perl
+Pin: version 5.8*
+Pin-Priority: 1001
+
+Package: *
+Pin: origin ""
+Pin-Priority: 999
+
+Package: *
+Pin: release unstable
+Pin-Priority: 50
+</programlisting>
+
+<!--
+<para>Then:
+-->
+<para>すると、
+<itemizedlist>
+<!--
+<listitem><simpara>The most recent available version of the <literal>perl</literal>
+package will be installed, so long as that version's version number begins
+with "<literal>5.8</literal>". If <emphasis>any</emphasis> 5.8* version of <literal>perl</literal> is
+available and the installed version is 5.9*, then <literal>perl</literal> will be
+downgraded.</simpara></listitem>
+-->
+<listitem><simpara>バージョン番号が "<literal>5.8</literal>" で始まっていれば、
+<literal>perl</literal> の最新の利用可能パッケージがインストールされます。
+バージョン 5.8* が利用可能で、バージョン 5.9* がインストールされている場合、
+<literal>perl</literal> はダウングレードされます。</simpara></listitem>
+<!--
+<listitem><simpara>A version of any package other than <literal>perl</literal>
+that is available from the local system has priority over other versions,
+even versions belonging to the target release.
+</simpara></listitem>
+-->
+<listitem><simpara>ローカルシステムで有効な、
+<literal>perl</literal> 以外のどんなパッケージでも、
+他のバージョンより (たとえターゲットリリースに属していても) 優先度が高くなります。
+</simpara></listitem>
+<!--
+<listitem><simpara>A version of a package whose origin is not the local
+system but some other site listed in &sources-list; and which belongs to
+an <literal>unstable</literal> distribution is only installed if it is selected
+for installation and no version of the package is already installed.
+</simpara></listitem>
+-->
+<listitem><simpara>ローカルシステムにはなくても &sources-list;
+に列挙されたサイトにあるバージョンで、
+<literal>unstable</literal> ディストリビューションに属しているパッケージは、
+インストールするよう選択され、
+既にインストールされているバージョンがない場合にのみインストールされます。
+</simpara></listitem>
+</itemizedlist>
+</para>
+</refsect2>
+
+<refsect2>
+<!--
+<title>Determination of Package Version and Distribution Properties</title>
+-->
+<title>パッケージのバージョンとディストリビューションプロパティの決定</title>
+
+<!--
+<para>The locations listed in the &sources-list; file should provide
+<filename>Packages</filename> and <filename>Release</filename> files
+to describe the packages available at that location. </para>
+-->
+<para>&sources-list; ファイルに列挙した場所では、
+その場所で利用できるパッケージを記述した、
+<filename>Packages</filename> ファイルや
+<filename>Release</filename> ファイルを提供します。</para>
+
+<!--
+<para>The <filename>Packages</filename> file is normally found in the directory
+<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>:
+for example, <filename>.../dists/stable/main/binary-i386/Packages</filename>.
+It consists of a series of multi-line records, one for each package available
+in that directory. Only two lines in each record are relevant for setting
+APT priorities:
+-->
+<para><filename>Packages</filename> ファイルは通常
+<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>
+ディレクトリにあります。
+例えば、<filename>.../dists/stable/main/binary-i386/Packages</filename> です。
+これは、ディレクトリにある利用可能パッケージごとに、
+複数行のレコードからできています。
+APT 優先度の設定は、レコードごとに以下の 2 行だけです。
+<variablelist>
+<varlistentry>
+<!--
+<term>the <literal>Package:</literal> line</term>
+<listitem><simpara>gives the package name</simpara></listitem>
+-->
+<term><literal>Package:</literal> 行</term>
+<listitem><simpara>パッケージ名を与えます。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<!--
+<term>the <literal>Version:</literal> line</term>
+<listitem><simpara>gives the version number for the named package</simpara></listitem>
+-->
+<term><literal>Version:</literal> 行</term>
+<listitem><simpara>その名前のパッケージのバージョン番号を与えます。</simpara></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>The <filename>Release</filename> file is normally found in the directory
+<filename>.../dists/<replaceable>dist-name</replaceable></filename>:
+for example, <filename>.../dists/stable/Release</filename>,
+or <filename>.../dists/woody/Release</filename>.
+It consists of a single multi-line record which applies to <emphasis>all</emphasis> of
+the packages in the directory tree below its parent. Unlike the
+<filename>Packages</filename> file, nearly all of the lines in a <filename>Release</filename>
+file are relevant for setting APT priorities:
+-->
+<para><filename>Release</filename> ファイルは、通常
+<filename>.../dists/<replaceable>dist-name</replaceable></filename>
+にあります。例えば、
+<filename>.../dists/stable/Release</filename>,
+<filename>.../dists/woody/Release</filename> です。
+これは、このディレクトリ以下にある<emphasis>全</emphasis>パッケージに適用する、
+複数行のレコード 1 つから成っています。
+<filename>Packages</filename> と違い <filename>Release</filename> ファイルは、
+ほとんどの行が APT 優先度の設定に関連します。
+
+<variablelist>
+<varlistentry>
+<!--
+<term>the <literal>Archive:</literal> line</term>
+-->
+<term><literal>Archive:</literal> 行</term>
+<!--
+<listitem><simpara>names the archive to which all the packages
+in the directory tree belong. For example, the line
+"Archive: stable"
+specifies that all of the packages in the directory
+tree below the parent of the <filename>Release</filename> file are in a
+<literal>stable</literal> archive. Specifying this value in the APT preferences file
+would require the line:
+-->
+<listitem><simpara>このディレクトリツリーに属する全パッケージのアーカイブ名。
+例えば、
+"Archive: stable"
+という行は、<filename>Release</filename> ファイルの親ディレクトリツリー以下にある全パッケージが、
+<literal>stable</literal> アーカイブだと指定します。
+APT 設定ファイルでこの値を指定するには、以下の行が必要になります。
+</simpara>
+<programlisting>
+Pin: release a=stable
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Version:</literal> line</term>
+-->
+<term><literal>Version:</literal> 行</term>
+<!--
+<listitem><simpara>names the release version. For example, the
+packages in the tree might belong to Debian GNU/Linux release
+version 3.0. Note that there is normally no version number for the
+<literal>testing</literal> and <literal>unstable</literal> distributions because they
+have not been released yet. Specifying this in the APT preferences
+file would require one of the following lines.
+-->
+<listitem><simpara>リリースバージョン名。
+例えば、このツリーのパッケージが、
+GNU/Linux リリースバージョン 3.0 に属するとします。
+通常 <literal>testing</literal> ディストリビューションや
+<literal>unstable</literal> ディストリビューションには、
+まだリリースされていないので、バージョン番号が付きません。
+APT 設定ファイルでこれを指定するには、以下の行のいずれかが必要になります。
+</simpara>
+
+<programlisting>
+Pin: release v=3.0
+Pin: release a=stable, v=3.0
+Pin: release 3.0
+</programlisting>
+
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Component:</literal> line</term>
+-->
+<term><literal>Component:</literal> 行</term>
+<!--
+<listitem><simpara>names the licensing component associated with the
+packages in the directory tree of the <filename>Release</filename> file.
+For example, the line "Component: main" specifies that
+all the packages in the directory tree are from the <literal>main</literal>
+component, which entails that they are licensed under terms listed
+in the Debian Free Software Guidelines. Specifying this component
+in the APT preferences file would require the line:
+-->
+<listitem><simpara><filename>Release</filename> ファイルの、
+ディレクトリツリーにあるパッケージのライセンスコンポーネント名。
+例えば、"Component: main" という行は、このディレクトリ以下の全ファイルが、
+<literal>main</literal> コンポーネント
+(Debian フリーソフトウェアガイドラインの元でライセンスされている)
+であることを表します。
+APT 設定ファイルでこのコンポーネントを指定するには、以下の行が必要になります。
+</simpara>
+<programlisting>
+Pin: release c=main
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Origin:</literal> line</term>
+-->
+<term><literal>Origin:</literal> 行</term>
+<!--
+<listitem><simpara>names the originator of the packages in the
+directory tree of the <filename>Release</filename> file. Most commonly, this is
+<literal>Debian</literal>. Specifying this origin in the APT preferences file
+would require the line:
+-->
+<listitem><simpara><filename>Release</filename> ファイルのディレクトリツリーにあるパッケージの提供者名。
+ほとんど共通で、<literal>Debian</literal> です。
+APT 設定ファイルでこの提供者を指定するには、以下の行が必要になります。
+</simpara>
+<programlisting>
+Pin: release o=Debian
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Label:</literal> line</term>
+-->
+<term><literal>Label:</literal> 行</term>
+<!--
+<listitem><simpara>names the label of the packages in the directory tree
+of the <filename>Release</filename> file. Most commonly, this is
+<literal>Debian</literal>. Specifying this label in the APT preferences file
+would require the line:
+-->
+<listitem><simpara><filename>Release</filename> ファイルのディレクトリツリーにあるパッケージのラベル名。
+ほとんど共通で <literal>Debian</literal> です。
+APT 設定ファイルでこのラベルを指定するには、以下の行が必要になります。
+</simpara>
+<programlisting>
+Pin: release l=Debian
+</programlisting>
+</listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>All of the <filename>Packages</filename> and <filename>Release</filename>
+files retrieved from locations listed in the &sources-list; file are stored
+in the directory <filename>/var/lib/apt/lists</filename>, or in the file named
+by the variable <literal>Dir::State::Lists</literal> in the <filename>apt.conf</filename> file.
+For example, the file
+<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename>
+contains the <filename>Release</filename> file retrieved from the site
+<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> architecture
+files from the <literal>contrib</literal> component of the <literal>unstable</literal>
+distribution.</para>
+-->
+<para>&sources-list; ファイルに列挙された場所から取得した
+<filename>Packages</filename> ファイルや
+<filename>Release</filename> ファイルはすべて、
+<filename>/var/lib/apt/lists</filename> ディレクトリや、
+<filename>apt.conf</filename> ファイルの
+<literal>Dir::State::Lists</literal> 変数で指定した場所に取得されます。例えば、
+<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> ファイルは、
+<literal>debian.lcs.mit.edu</literal> から取得した、
+<literal>unstable</literal> ディストリビューションで、
+<literal>contrib</literal> コンポーネントな、
+<literal>binary-i386</literal> アーキテクチャ用の
+<filename>Release</filename> ファイルを含んでいます。</para>
+</refsect2>
+
+<refsect2>
+<!--
+<title>Optional Lines in an APT Preferences Record</title>
+-->
+<title>APT 設定レコードのオプション行</title>
+
+<!--
+<para>Each record in the APT preferences file can optionally begin with
+one or more lines beginning with the word <literal>Explanation:</literal>.
+This provides a place for comments.</para>
+-->
+<para>APT 設定ファイルのレコードごとに、
+任意で <literal>Explanation:</literal> で始まる行を持てます。
+これは、コメント用の場所を確保します。</para>
+
+<!--
+<para>The <literal>Pin-Priority:</literal> line in each APT preferences record is
+optional. If omitted, APT assigs a priority of 1 less than the last value
+specified on a line beginning with <literal>Pin-Priority: release ...</literal>.</para>
+-->
+<para>APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。
+省略すると、<literal>Pin-Priority: release ...</literal>
+で始まる行で指示した最後の値 (少なくとも1つ) を優先度に割り当てます。</para>
+</refsect2>
+</refsect1>
+
+<refsect1>
+<!--
+<title>Examples</title>
+-->
+<title>サンプル</title>
+<refsect2>
+<!--
+<title>Tracking Stable</title>
+-->
+<title>安定版を追跡</title>
+
+<!--
+<para>The following APT preferences file will cause APT to assign a
+priority higher than the default (500) to all package versions belonging
+to a <literal>stable</literal> distribution and a prohibitively low priority to
+package versions belonging to other <literal>Debian</literal> distributions.
+-->
+<para>以下の APT 設定ファイルは、<literal>stable</literal>
+ディストリビューションに属する全てのパッケージのバージョンに、
+デフォルト (500) より高い優先度を割り当て、
+他の <literal>Debian</literal>
+ディストリビューションのパッケージのバージョンには、
+低くてインストールできないような優先度を割り当てます。
+
+<programlisting>
+Explanation: Uninstall or do not install any Debian-originated
+Explanation: package versions other than those in the stable distro
+Package: *
+Pin: release a=stable
+Pin-Priority: 900
+
+Package: *
+Pin: release o=Debian
+Pin-Priority: -10
+</programlisting>
+</para>
+
+<!--
+<para>With a suitable &sources-list; file and the above preferences file,
+any of the following commands will cause APT to upgrade to the
+latest <literal>stable</literal> version(s).
+-->
+<para>適切な &sources-list; ファイルと上記の設定ファイルにより、
+以下のコマンドで最新の <literal>stable</literal>
+バージョンにアップグレードできます。
+
+<programlisting>
+apt-get install <replaceable>package-name</replaceable>
+apt-get upgrade
+apt-get dist-upgrade
+</programlisting>
+</para>
+
+<!--
+<para>The following command will cause APT to upgrade the specified
+package to the latest version from the <literal>testing</literal> distribution;
+the package will not be upgraded again unless this command is given
+again.
+-->
+<para>以下のコマンドで、指定したパッケージを <literal>testing</literal>
+ディストリビューションの最新バージョンにアップグレードします。
+このパッケージは、再度このコマンドを発行しないとアップグレードされません。
+
+<programlisting>
+apt-get install <replaceable>package</replaceable>/testing
+</programlisting>
+</para>
+</refsect2>
+
+ <refsect2>
+<!--
+ <title>Tracking Testing or Unstable</title>
+-->
+ <title>テスト版や不安定版を追跡</title>
+
+<!--
+<para>The following APT preferences file will cause APT to assign
+a high priority to package versions from the <literal>testing</literal>
+distribution, a lower priority to package versions from the
+<literal>unstable</literal> distribution, and a prohibitively low priority
+to package versions from other <literal>Debian</literal> distributions.
+-->
+<para>以下の APT 設定ファイルは、<literal>testing</literal>
+ディストリビューションのパッケージのバージョンに高い優先度を割り当て、
+<literal>unstable</literal>
+ディストリビューションのパッケージのバージョンには低い優先度を割り当てます。
+また他の <literal>Debian</literal>
+ディストリビューションのパッケージのバージョンには、
+低くてインストールできないような優先度を割り当てます。
+
+<programlisting>
+Package: *
+Pin: release a=testing
+Pin-Priority: 900
+
+Package: *
+Pin: release a=unstable
+Pin-Priority: 800
+
+Package: *
+Pin: release o=Debian
+Pin-Priority: -10
+</programlisting>
+</para>
+
+<!--
+<para>With a suitable &sources-list; file and the above preferences file,
+any of the following commands will cause APT to upgrade to the latest
+<literal>testing</literal> version(s).
+-->
+<para>適切な &sources-list; ファイルと上記の設定ファイルにより、
+以下のコマンドで最新の <literal>testing</literal>
+バージョンにアップグレードできます。
+
+<programlisting>
+apt-get install <replaceable>package-name</replaceable>
+apt-get upgrade
+apt-get dist-upgrade
+</programlisting>
+</para>
+
+<!--
+<para>The following command will cause APT to upgrade the specified
+package to the latest version from the <literal>unstable</literal> distribution.
+Thereafter, <command>apt-get upgrade</command> will upgrade
+the package to the most recent <literal>testing</literal> version if that is
+more recent than the installed version, otherwise, to the most recent
+<literal>unstable</literal> version if that is more recent than the installed
+version.
+-->
+<para>以下のコマンドで、指定したパッケージを <literal>unstable</literal>
+ディストリビューションの最新バージョンにアップグレードします。
+それ以降、<command>apt-get upgrade</command> は
+<literal>testing</literal> バージョンのパッケージが更新されていれば
+<literal>testing</literal> の最新版に、
+<literal>unstable</literal> バージョンのパッケージが更新されていれば
+<literal>unstable</literal>の最新版にアップグレードします。
+
+<programlisting>
+apt-get install <replaceable>package</replaceable>/unstable
+</programlisting>
+</para>
+
+</refsect2>
+</refsect1>
+
+<refsect1>
+<!--
+<title>See Also</title>
+-->
+<title>関連項目</title>
+<para>&apt-get; &apt-cache; &apt-conf; &sources-list;
+</para>
+</refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/makefile b/doc/ja/makefile
index 9e757b590..286152995 100644
--- a/doc/ja/makefile
+++ b/doc/ja/makefile
@@ -5,7 +5,59 @@ SUBDIR=doc/ja
# Bring in the default rules
include ../../buildlib/defaults.mak
+# Do not use XMLTO, build the manpages directly with XSLTPROC
+XSLTPROC=/usr/bin/xsltproc
+STYLESHEET=./style.ja.xsl
+
+
# Man pages
-SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5
+SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5 \
+ sources.list.ja.5 apt-config.ja.8 apt-sortpkgs.ja.1 \
+ apt-ftparchive.ja.1 apt_preferences.ja.5 apt-extracttemplates.ja.1 \
+ apt-key.ja.8 apt-secure.ja.8
+
INCLUDES = apt.ent.ja
-include $(SGML_MANPAGE_H)
+
+doc: $(SOURCE)
+
+$(SOURCE) :: % : %.xml $(INCLUDES)
+ echo Creating man page $@
+ $(XSLTPROC) -o $@ $(STYLESHEET) $<
+
+apt-cache.ja.8:: apt-cache.8
+ cp $< $@
+
+apt-get.ja.8:: apt-get.8
+ cp $< $@
+
+apt-cdrom.ja.8:: apt-cdrom.8
+ cp $< $@
+
+apt.conf.ja.5:: apt.conf.5
+ cp $< $@
+
+apt-config.ja.8:: apt-config.8
+ cp $< $@
+
+sources.list.ja.5:: sources.list.5
+ cp $< $@
+
+apt-sortpkgs.ja.1:: apt-sortpkgs.1
+ cp $< $@
+
+apt-ftparchive.ja.1:: apt-ftparchive.1
+ cp $< $@
+
+apt_preferences.ja.5:: apt_preferences.5
+ cp $< $@
+
+apt-extracttemplates.ja.1:: apt-extracttemplates.1
+ cp $< $@
+
+apt-key.ja.8:: apt-key.8
+ cp $< $@
+
+apt-secure.ja.8:: apt-secure.8
+ cp $< $@
+
+
diff --git a/doc/ja/manpage.links b/doc/ja/manpage.links
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/doc/ja/manpage.links
diff --git a/doc/ja/manpage.refs b/doc/ja/manpage.refs
new file mode 100644
index 000000000..16ffc791b
--- /dev/null
+++ b/doc/ja/manpage.refs
@@ -0,0 +1,4 @@
+{
+ '' => '',
+ '' => ''
+}
diff --git a/doc/ja/sources.list.ja.5.xml b/doc/ja/sources.list.ja.5.xml
new file mode 100644
index 000000000..e000d8767
--- /dev/null
+++ b/doc/ja/sources.list.ja.5.xml
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+ &apt-author.jgunthorpe;
+ &apt-author.team;
+ &apt-email;
+ &apt-product;
+ <!-- The last update date -->
+ <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>sources.list</refentrytitle>
+ <manvolnum>5</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+ <refname>sources.list</refname>
+<!--
+ <refpurpose>Package resource list for APT</refpurpose>
+-->
+ <refpurpose>APT 用パッケージリソースリスト</refpurpose>
+ </refnamediv>
+
+<!--
+ <refsect1><title>Description</title>
+ -->
+ <refsect1><title>説明</title>
+<!--
+ <para>The package resource list is used to locate archives of the package
+ distribution system in use on the system. At this time, this manual page
+ documents only the packaging system used by the Debian GNU/Linux system.
+ This control file is located in <filename>/etc/apt/sources.list</filename></para>
+-->
+ <para>このパッケージリソースリストは、
+ システムで使用するパッケージの保管場所を特定するのに使用されます。
+ 今回このマニュアルページには、
+ Debian GNU/Linux システムで使用するパッケージシステムについてのみ記述します。
+ この制御ファイルは、<filename>/etc/apt/sources.list</filename> にあります。</para>
+
+<!--
+ <para>The source list is designed to support any number of active sources and a
+ variety of source media. The file lists one source per line, with the
+ most preferred source listed first. The format of each line is:
+ <literal>type uri args</literal> The first item, <literal>type</literal>
+ determines the format for <literal>args</literal> <literal>uri</literal> is
+ a Universal Resource Identifier
+ (URI), which is a superset of the more specific and well-known Universal
+ Resource Locator, or URL. The rest of the line can be marked as a comment
+ by using a #.</para>
+-->
+ <para>ソースリストは複数の有効な取得元と、
+ 様々な取得メディアをサポートしています。
+ ファイルには 1 行ごと取得元を列挙し、上の方にあるものから使用します。
+ 行のフォーマットは、<literal>タイプ uri 引数</literal> となります。
+ 先頭の <literal>タイプ</literal> で、
+ <literal>引数</literal> のフォーマットを決定します。
+ <literal>uri</literal> は Universal Resource Identifier (URI) で、
+ よく知られた URL のスーパーセットです。
+ 行の残りに # を付けて、コメントにできます。</para>
+ </refsect1>
+
+ <refsect1><title>sources.list.d</title>
+<!--
+ <para>The <filename>/etc/apt/sources.list.d</filename> directory provides
+ a way to add sources.list entries in seperate files that end with
+ <literal>.list</literal>. The format is the same as for the regular
+ <filename>sources.list</filename> file. </para>
+-->
+ <para><filename>/etc/apt/sources.list.d</filename> ディレクトリに
+ ファイル名が <literal>.list</literal> で終わる個別ファイルを置いておくと、
+ sources.list エントリに追加できます。フォーマットは、
+ 通常の <filename>sources.list</filename> ファイルと同じです。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>The deb and deb-src types</title>
+-->
+ <refsect1><title>deb タイプと deb-src タイプ</title>
+<!--
+ <para>The <literal>deb</literal> type describes a typical two-level Debian
+ archive, <filename>distribution/component</filename>. Typically,
+ <literal>distribution</literal> is generally one of
+ <literal>stable</literal> <literal>unstable</literal> or
+ <literal>testing</literal> while component is one of <literal>main</literal>
+ <literal>contrib</literal> <literal>non-free</literal> or
+ <literal>non-us</literal> The
+ <literal>deb-src</literal> type describes a debian distribution's source
+ code in the same form as the <literal>deb</literal> type.
+ A <literal>deb-src</literal> line is required to fetch source indexes.</para>
+-->
+ <para><literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ
+ (<filename>distribution/component</filename>) を記述します。
+ よくあるケースでは、<literal>distribution</literal> は通常
+ <literal>stable</literal> <literal>unstable</literal>
+ <literal>testing</literal> のどれか、
+ component は、<literal>main</literal> <literal>contrib</literal>
+ <literal>non-free</literal> <literal>non-us</literal> のどれかです。
+ <literal>deb-src</literal> タイプでは、
+ Debian ディストリビューションのソースコードを、
+ <literal>deb</literal> タイプと同じ形式で記述します。
+ <literal>deb-src</literal> 行は、
+ ソースインデックスを取得するのに必要です。</para>
+
+<!--
+ <para>The format for a <filename>sources.list</filename> entry using the
+ <literal>deb</literal> and <literal>deb-src</literal> types are:</para>
+-->
+ <para><literal>deb</literal> タイプと <literal>deb-src</literal>
+ タイプで使用する <filename>sources.list</filename>
+ エントリのフォーマットは、以下になります。</para>
+
+ <literallayout>deb uri distribution [component1] [component2] [...]</literallayout>
+
+<!--
+ <para>The URI for the <literal>deb</literal> type must specify the base of the
+ Debian distribution, from which APT will find the information it needs.
+ <literal>distribution</literal> can specify an exact path, in which case the
+ components must be omitted and <literal>distribution</literal> must end with
+ a slash (/). This is useful for when only a particular sub-section of the
+ archive denoted by the URI is of interest.
+ If <literal>distribution</literal> does not specify an exact path, at least
+ one <literal>component</literal> must be present.</para>
+-->
+ <para><literal>deb</literal> タイプの URI は、
+ APT が情報を見つけられるように、
+ Debian ディストリビューションの基底を指定しなければなりません。
+ <literal>distribution</literal> には正確なパスを指定できます。
+ その場合 component を省略し、<literal>distribution</literal>
+ はスラッシュ (/) で終わらなくてはなりません。
+ これは URL で指定されたアーカイブの、
+ 特定のサブセクションのみに関心があるときに役に立ちます。
+ <literal>distribution</literal> に正確なパスを指定しないのなら、
+ 少なくともひとつは <literal>component</literal> を指定しなければなりません。</para>
+
+<!--
+ <para><literal>distribution</literal> may also contain a variable,
+ <literal>$(ARCH)</literal>
+ which expands to the Debian architecture (i386, m68k, powerpc, ...)
+ used on the system. This permits architecture-independent
+ <filename>sources.list</filename> files to be used. In general this is only
+ of interest when specifying an exact path, <literal>APT</literal> will
+ automatically generate a URI with the current architecture otherwise.</para>
+-->
+ <para><literal>distribution</literal> は、
+ <literal>$(ARCH)</literal> 変数を含む場合があります。
+ <literal>$(ARCH)</literal> 変数は、システムで使用している
+ Debian アーキテクチャ (i386, m68k, powerpc, ...) に展開されます。
+ これにより、アーキテクチャに依存しない <filename>sources.list</filename>
+ ファイルを使用できます。
+ 一般的に、これは正しいパスを指定するときに気にするだけです。
+ そうでない場合は、<literal>APT</literal> は現在のアーキテクチャで URI
+ を自動的に生成します。</para>
+
+<!--
+ <para>Since only one distribution can be specified per line it may be necessary
+ to have multiple lines for the same URI, if a subset of all available
+ distributions or components at that location is desired.
+ APT will sort the URI list after it has generated a complete set
+ internally, and will collapse multiple references to the same Internet
+ host, for instance, into a single connection, so that it does not
+ inefficiently establish an FTP connection, close it, do something else,
+ and then re-establish a connection to that same host. This feature is
+ useful for accessing busy FTP sites with limits on the number of
+ simultaneous anonymous users. APT also parallelizes connections to
+ different hosts to more effectively deal with sites with low bandwidth.</para>
+-->
+ <para>有効な全 distribution, component の場所から、
+ 一部が必要な場合、1 行につき 1 distribution しか指定できないため、
+ 同じ URI の行を複数記述することになるでしょう。
+ APT は内部で URI リストを生成してから、並べ替えます。
+ そして、同じインターネットホストに対しては複数の参照をまとめます。
+ 例えば FTP 接続後、切断してからまた同じホストに再接続するといった、
+ 効率の悪いことをせずに、1 接続にまとめます。
+ この機能は、同時接続匿名ユーザ数を制限している、
+ 混んでいる FTP サイトにアクセスするのに便利です。
+ APT は、帯域の狭いサイトを効率よく扱うのに、
+ 異なるホストへは、接続を並行して行うようにもしています。</para>
+
+<!--
+ <para>It is important to list sources in order of preference, with the most
+ preferred source listed first. Typically this will result in sorting
+ by speed from fastest to slowest (CD-ROM followed by hosts on a local
+ network, followed by distant Internet hosts, for example).</para>
+-->
+ <para>最優先する取得元を最初に記述するというように、
+ 優先順に取得元を記述するのは重要です。
+ 一般的には、スピードの速い順に並べることになる
+ (例えば、CD-ROM に続いてローカルネットワークのホスト、
+ さらに続いて彼方のインターネットホスト) でしょう。</para>
+
+<!--
+ <para>Some examples:</para>
+-->
+ <para>例:</para>
+ <literallayout>
+deb http://http.us.debian.org/debian stable main contrib non-free
+deb http://http.us.debian.org/debian dists/stable-updates/
+ </literallayout>
+
+ </refsect1>
+
+<!--
+ <refsect1><title>URI specification</title>
+-->
+ <refsect1><title>URI の仕様</title>
+
+<!--
+ <para>The currently recognized URI types are cdrom, file, http, and ftp.
+-->
+ <para>現在認識する URI 対応は、cdrom, file, http, ftp です。
+ <variablelist>
+ <varlistentry><term>file</term>
+<!--
+ <listitem><para>
+ The file scheme allows an arbitrary directory in the file system to be
+ considered an archive. This is useful for NFS mounts and local mirrors or
+ archives.</para></listitem>
+-->
+ <listitem><para>
+ file スキームは、システム内の任意のディレクトリを、
+ アーカイブとして扱えるようにします。
+ これは NFS マウントやローカルミラーで便利です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>cdrom</term>
+<!--
+ <listitem><para>
+ The cdrom scheme allows APT to use a local CDROM drive with media
+ swapping. Use the &apt-cdrom; program to create cdrom entries in the
+ source list.</para></listitem>
+-->
+ <listitem><para>
+ cdrom スキームは、APT がローカル CD-ROM ドライブを、
+ メディア交換しながら使えるようにします。
+ 取得元リストに cdrom エントリを追加するには、
+ &apt-cdrom; プログラムを使用してください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>http</term>
+<!--
+ <listitem><para>
+ The http scheme specifies an HTTP server for the archive. If an environment
+ variable <envar>http_proxy</envar> is set with the format
+ http://server:port/, the proxy server specified in
+ <envar>http_proxy</envar> will be used. Users of authenticated
+ HTTP/1.1 proxies may use a string of the format
+ http://user:pass@server:port/
+ Note that this is an insecure method of authentication.</para></listitem>
+-->
+ <listitem><para>
+ http スキームはアーカイブとして、HTTP サーバを指定します。
+ 環境変数 <envar>http_proxy</envar> が、
+ http://server:port/ と言った形で指定されていれば、
+ <envar>http_proxy</envar> で指定した プロキシサーバを使用します。
+ ユーザ認証が必要な HTTP/1.1 プロキシの場合、
+ http://user:pass@server:port/ と言う形で指定してください。
+ この認証方法は安全ではないことに注意してください。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>ftp</term>
+<!--
+ <listitem><para>
+ The ftp scheme specifies an FTP server for the archive. APT's FTP behavior
+ is highly configurable; for more information see the
+ &apt-conf; manual page. Please note that a ftp proxy can be specified
+ by using the <envar>ftp_proxy</envar> environment variable. It is possible
+ to specify a http proxy (http proxy servers often understand ftp urls)
+ using this method and ONLY this method. ftp proxies using http specified in
+ the configuration file will be ignored.</para></listitem>
+-->
+ <listitem><para>
+ ftp スキームは、アーカイブに FTP サーバを指定します。
+ APT の FTP の振る舞いは、高度に設定できます。
+ 詳細は、&apt-conf; のマニュアルページをご覧ください。
+ ftp プロキシは、
+ <envar>ftp_proxy</envar> 環境変数で指定することにご注意ください。
+ この方法用に、さらにこの方法でしか使用しないのに、
+ http プロキシを使用することができます
+ (http プロキシサーバは大抵 ftp urlも理解できます)。
+ 設定ファイルで http を使用する際に、
+ ftp プロキシを使用するよう設定してあっても無視されます。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>copy</term>
+<!--
+ <listitem><para>
+ The copy scheme is identical to the file scheme except that packages are
+ copied into the cache directory instead of used directly at their location.
+ This is useful for people using a zip disk to copy files around with APT.</para></listitem>
+-->
+ <listitem><para>
+ copy スキームは、file スキームと同様ですが、パッケージをその場で使用せず、
+ キャッシュディレクトリにコピーするところが違います。
+ zip ディスクを使用していて、APT でコピーを行う場合に便利です。</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term>rsh</term><term>ssh</term>
+<!--
+ <listitem><para>
+ The rsh/ssh method invokes rsh/ssh to connect to a remote host
+ as a given user and access the files. No password authentication is
+ possible, prior arrangements with RSA keys or rhosts must have been made.
+ Access to files on the remote uses standard <command>find</command> and
+ <command>dd</command>
+ commands to perform the file transfers from the remote.</para></listitem>
+-->
+ <listitem><para>
+ rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、
+ ファイルにアクセスするのに rsh/ssh を使用します。
+ あらかじめ RSA キーや rhosts の配置が必要ですが、
+ パスワードなし認証が可能です。
+ リモートホストのファイルへのアクセスの際、
+ ファイル転送に標準の <command>find</command> コマンドや
+ <command>dd</command> コマンドを使用します。</para></listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Examples</title>
+-->
+ <refsect1><title>サンプル</title>
+<!--
+ <para>Uses the archive stored locally (or NFS mounted) at /home/jason/debian
+ for stable/main, stable/contrib, and stable/non-free.</para>
+-->
+ <para> /home/jason/debian に格納されている stable/main, stable/contrib,
+ stable/non-free 用のローカル (または NFS) アーカイブを使用します。</para>
+ <literallayout>deb file:/home/jason/debian stable main contrib non-free</literallayout>
+
+<!--
+ <para>As above, except this uses the unstable (development) distribution.</para>
+-->
+ <para>上記同様ですが、不安定版を使用します。</para>
+ <literallayout>deb file:/home/jason/debian unstable main contrib non-free</literallayout>
+
+<!--
+ <para>Source line for the above</para>
+-->
+ <para>上記のソース行</para>
+ <literallayout>deb-src file:/home/jason/debian unstable main contrib non-free</literallayout>
+
+<!--
+ <para>Uses HTTP to access the archive at archive.debian.org, and uses only
+ the hamm/main area.</para>
+-->
+ <para>archive.debian.org のアーカイブに HTTP アクセスし、
+ hamm/main のみを使用します。</para>
+ <literallayout>deb http://archive.debian.org/debian-archive hamm main</literallayout>
+
+<!--
+ <para>Uses FTP to access the archive at ftp.debian.org, under the debian
+ directory, and uses only the stable/contrib area.</para>
+-->
+ <para>ftp.debian.org のアーカイブに FTP アクセスし、
+ debian ディレクトリ以下の stable/contrib のみを使用します。</para>
+ <literallayout>deb ftp://ftp.debian.org/debian stable contrib</literallayout>
+
+<!--
+ <para>Uses FTP to access the archive at ftp.debian.org, under the debian
+ directory, and uses only the unstable/contrib area. If this line appears as
+ well as the one in the previous example in <filename>sources.list</filename>.
+ a single FTP session will be used for both resource lines.</para>
+-->
+ <para>ftp.debian.org のアーカイブに FTP アクセスし、
+ debian ディレクトリ以下の unstable/contrib を使用します。
+ <filename>sources.list</filename> に上記サンプルと一緒に指定された場合、
+ 両方のリソース行に対応する FTP セッションはひとつだけになります。</para>
+ <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout>
+
+<!--
+ <para>Uses HTTP to access the archive at nonus.debian.org, under the
+ debian-non-US directory.</para>
+-->
+ <para>nonus.debian.org のアーカイブに HTTP アクセスし、
+ debian-non-US ディレクトリ以下を使用します。</para>
+ <literallayout>deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free</literallayout>
+
+<!--
+ <para>Uses HTTP to access the archive at nonus.debian.org, under the
+ debian-non-US directory, and uses only files found under
+ <filename>unstable/binary-i3866</filename> on i386 machines,
+ <filename>unstable/binary-m68k</filename> on m68k, and so
+ forth for other supported architectures. [Note this example only
+ illustrates how to use the substitution variable; non-us is no longer
+ structured like this]
+ <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout>
+ </para>
+-->
+ <para>nonus.debian.org のアーカイブに HTTP アクセスし、
+ debian-non-US ディレクトリ以下を使用します。
+ また、i386 マシンでは <filename>unstable/binary-i386</filename>
+ 以下にあるファイル、
+ m68k マシンでは <filename>unstable/binary-m68k</filename>
+ 以下にあるファイル、
+ その他サポートするアーキテクチャごとのファイルのみ使用します。
+ [このサンプルは変数展開の使用法の説明でしかないことに注意してください。
+ non-us はこのような構造になっていません]
+ <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout>
+ </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+ <para>&apt-cache; &apt-conf;
+ </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/style.ja.xsl b/doc/ja/style.ja.xsl
new file mode 100644
index 000000000..4af2d74cf
--- /dev/null
+++ b/doc/ja/style.ja.xsl
@@ -0,0 +1,9 @@
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
+
+<xsl:param name="chunker.output.encoding" select="'EUC-JP'" />
+
+</xsl:stylesheet> \ No newline at end of file
diff --git a/methods/connect.cc b/methods/connect.cc
index 4e48927ed..8c2ac6d56 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -103,6 +103,8 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
if (Err != 0)
{
errno = Err;
+ if(errno == ECONNREFUSED)
+ Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
Service,Name);
}
diff --git a/po/ChangeLog b/po/ChangeLog
index 068f614d3..0767deb75 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,102 @@
+2006-02-14 Carlos Z.F. Liu <carlosliu@users.sourceforge.net>
+
+ * zh_CN.po: Completed to 512t. Closes: #353936
+
+2006-02-14 Samuele Giovanni Tonon <samu@debian.org>
+
+ * it.po: Completed to 512t. Closes: #352803
+
+2006-02-13 Andre Luis Lopes <andrelop@debian.org>
+
+ * ca.po: Completed to 512t. Closes: #352419
+
+2006-02-06 Jordi Mallach <jordi@debian.org>
+
+ * ca.po: Completed to 512t. Closes: #351592
+
+2006-01-30 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Completed to 512t. Closes: #350483
+
+2006-01-24 Kenshi Muto <kmuto@debian.org>
+
+ * ja.po: Completed to 512t. Closes: #349806
+
+2006-01-23 Bartosz Fenski aka fEnIo <fenio@debian.org>
+
+ * pl.po: Completed to 512t. Closes: #349514
+
+2006-01-23 Peter Mann <Peter.Mann@tuke.sk>
+
+ * sk.po: Completed to 512t. Closes: #349474
+
+2006-01-23 Jacobo Tarrio <jtarrio@trasno.net>
+
+ * gl.po: Completed to 512 strings
+ Closes: #349407
+
+2006-01-22 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: Completed to 512 strings
+
+2006-01-21 Daniel Nylander <yeager@lidkoping.net>
+
+ * sv.po: Completed to 512 strings
+ Closes: #349210
+
+2006-01-21 Yuri Kozlov <kozlov.y@gmail.com>
+
+ * ru.po: Completed to 512 strings
+ Closes: #349154
+
+2006-01-21 Claus Hindsgaul <claus_h@image.dk>
+
+ * da.po: Completed to 512 strings
+ Closes: #349084
+
+2006-01-20 Christian Perrier <bubulle@debian.org>
+
+ * fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+
+2006-01-20 Christian Perrier <bubulle@debian.org>
+
+ * *.po: Updated from sources (512 strings)
+
+2006-01-20 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: Completed to 511 strings
+ Closes: #348968
+
+2006-01-18 Konstantinos Margaritis <markos@debian.org>
+
+ * el.po: Completed to 511 strings
+ Closes: #344642
+
+2005-11-07 Claus Hindsgaul <claus_h@image.dk>
+
+ * da.po: Completed to 511 strings
+ Closes: #348574
+
+2005-11-16 Andrew Deason <adeason@tjhsst.edu>
+
+ * en_GB.po: Minor errors correction
+
+2005-11-12 Ruben Porras <nahoo82@telefonica.net>
+
+ * es.po: Updated to 510t1f
+ Closes: #348158
+
+2005-11-12 Jacobo Tarrio <jacobo@tarrio.org>
+
+ * gl.po: Completed to 511 strings
+ Closes: #347729
+
+2006-01-10 Samuele Giovanni Tonon <samu@mclink.it>
+
+ * it.po: Yet another update
+ Closes: #347435
+
2006-01-09 Jonas Koelker <jonaskoelker@users.sourceforge.net>
* en_GB.po, de.po: fix spaces errors in "Ign " translations
diff --git a/po/LINGUAS b/po/LINGUAS
index 5e7fabb43..4e753926a 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-bs ca cs da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW
+bs ca cs cy da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 541a90df4..23de34b5c 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-17 19:31+0200\n"
+"POT-Creation-Date: 2006-01-20 14:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,153 +15,145 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
-#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
msgstr ""
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:232
msgid "Total package names : "
msgstr ""
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
msgstr ""
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr ""
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
msgstr ""
-#: cmdline/apt-cache.cc:293
-msgid "Total Distinct Descriptions: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
msgstr ""
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
msgstr ""
-#: cmdline/apt-cache.cc:300
-msgid "Total Desc/File relations: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
msgstr ""
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr ""
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1462
msgid "Package files:"
msgstr ""
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr ""
#. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr ""
#. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1541
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1720
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -200,6 +192,18 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr ""
@@ -239,7 +243,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -413,7 +417,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr ""
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr ""
@@ -422,12 +426,12 @@ msgstr ""
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
@@ -527,221 +531,221 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr ""
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr ""
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr ""
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr ""
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr ""
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr ""
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr ""
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr ""
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr ""
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr ""
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -749,74 +753,74 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -824,79 +828,79 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1570
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"
@@ -904,158 +908,163 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1578
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:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2273
#, 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:2255
+#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2424
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1256,7 +1265,7 @@ msgstr ""
msgid "Failed to write file %s"
msgstr ""
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -1309,7 +1318,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1339,9 +1349,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: 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 ""
@@ -1473,13 +1483,12 @@ msgstr ""
msgid "File not found"
msgstr ""
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
+#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-#: methods/rred.cc:240
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr ""
@@ -1605,7 +1614,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1735,76 +1744,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:345
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:491
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:499
+#: methods/http.cc:530
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:518 methods/http.cc:525
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:554
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:569
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:571
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:595
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:742
+#: methods/http.cc:773
msgid "Select failed"
msgstr ""
-#: methods/http.cc:747
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:770
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:798
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:823
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:837
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:839
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1070
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1087
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1178
+#: methods/http.cc:1215
msgid "Internal error"
msgstr ""
@@ -1817,7 +1826,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:984
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1938,7 +1947,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2014,72 +2023,72 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:135
+#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:141
+#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:146
+#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr ""
@@ -2105,52 +2114,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2194,7 +2203,7 @@ msgstr ""
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2214,12 +2223,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2262,121 +2271,110 @@ msgstr ""
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:155
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:219
+#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:223
+#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:247
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:253
+#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:259
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:290
+#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:303
+#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:309
+#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:679
+#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635
-#: apt-pkg/acquire-item.cc:1336
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1203
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1239
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr ""
@@ -2385,94 +2383,92 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:531
+#: apt-pkg/cdrom.cc:507
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:565
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr ""
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:647
#, c-format
-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:737
+#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:753
+#: apt-pkg/cdrom.cc:726
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:757
+#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:783
+#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:792
+#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:832
+#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
msgstr ""
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2527,10 +2523,6 @@ msgstr ""
msgid "Removed with config %s"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr ""
-
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 966e86bc4..ddf8fd277 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-17 19:31+0200\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -14,155 +14,145 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
-#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
msgstr "Ne mogu pronaći paket %s"
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:232
msgid "Total package names : "
msgstr "Ukupno naziva paketa:"
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
msgstr " Normalni paketi:"
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
msgstr " Čisto virtuelni paketi:"
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
msgstr " Pojedinačni virutuelni paketi:"
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
msgstr " Miješani virtuelni paketi:"
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr " Nedostajući:"
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
msgstr "Ukupno različitih verzija:"
-#: cmdline/apt-cache.cc:293
-#, fuzzy
-msgid "Total Distinct Descriptions: "
-msgstr "Ukupno različitih verzija:"
-
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
msgstr "Ukupno zavisnosti:"
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
msgstr "Ukupno Verzija/Datoteka odnosa:"
-#: cmdline/apt-cache.cc:300
-#, fuzzy
-msgid "Total Desc/File relations: "
-msgstr "Ukupno Verzija/Datoteka odnosa:"
-
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
msgstr ""
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr "Paketi nisu pronađeni"
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1462
msgid "Package files:"
msgstr "Datoteke paketa:"
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr ""
#. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr " Instalirano:"
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr ""
#. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1541
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1720
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -201,6 +191,18 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumenti nisu u parovima"
@@ -252,7 +254,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Ne mogu zapisati na %s"
@@ -427,7 +429,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr ""
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr ""
@@ -436,12 +438,12 @@ msgstr ""
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
@@ -541,223 +543,223 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "ali je %s instaliran"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "ali se ne može instalirati"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "ali je virtuelni paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "ali nije instaliran"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "ali se neće instalirati"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " ili"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Slijedeći paketi će biti UKLONJENI:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Slijedeći paketi su zadržani:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Ispravljam zavisnosti..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Ne mogu ispraviti zavisnosti"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Urađeno"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Da, uradi kako kažem!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -765,75 +767,75 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Odustani."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Odustajem od instalacije."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr "[Instalirano]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -841,79 +843,79 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1570
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"
@@ -921,158 +923,163 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1578
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:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2273
#, 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:2255
+#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2424
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1273,7 +1280,7 @@ msgstr ""
msgid "Failed to write file %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -1326,7 +1333,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ne mogu čitati %s"
@@ -1356,9 +1364,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: 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 "Čitam spiskove paketa"
@@ -1492,13 +1500,12 @@ msgstr "Datoteka nije pronađena"
msgid "File not found"
msgstr "Datoteka nije pronađena"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
+#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-#: methods/rred.cc:240
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr ""
@@ -1625,7 +1632,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1756,76 +1763,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:345
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Čekam na zaglavlja"
-#: methods/http.cc:491
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:499
+#: methods/http.cc:530
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:518 methods/http.cc:525
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:554
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:569
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:571
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:595
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:742
+#: methods/http.cc:773
msgid "Select failed"
msgstr ""
-#: methods/http.cc:747
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:770
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:798
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:823
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:837
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:839
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1070
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1087
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1178
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1838,7 +1845,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:984
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1959,7 +1966,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -2035,73 +2042,73 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:135
+#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:141
+#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:146
+#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Depends"
msgstr "Zavisi"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
msgstr "Unaprijed zavisi"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
msgstr "Predlaže"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
msgstr "Preporučuje"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
#, fuzzy
msgid "Conflicts"
msgstr "Sukobljava se sa"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
msgstr "Zamjenjuje"
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
msgstr "Zastarijeva"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "important"
msgstr "važno"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "required"
msgstr "zahtijevano"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "standard"
msgstr "standardno"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "optional"
msgstr "opcionalno"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr "extra"
@@ -2127,52 +2134,52 @@ msgstr ""
msgid "Unable to parse package file %s (2)"
msgstr ""
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otvaram %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
@@ -2216,7 +2223,7 @@ msgstr ""
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2236,12 +2243,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2284,121 +2291,110 @@ msgstr ""
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:155
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:219
+#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:223
+#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:247
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:253
+#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:259
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:290
+#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:303
+#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:309
+#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:679
+#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635
-#: apt-pkg/acquire-item.cc:1336
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1203
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1239
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr ""
@@ -2407,96 +2403,94 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:531
+#: apt-pkg/cdrom.cc:507
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:565
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr ""
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:583
#, fuzzy
msgid "Waiting for disc...\n"
msgstr "Čekam na zaglavlja"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:647
#, c-format
-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:737
+#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:753
+#: apt-pkg/cdrom.cc:726
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:757
+#: apt-pkg/cdrom.cc:730
#, fuzzy
msgid "Copying package lists..."
msgstr "Čitam spiskove paketa"
-#: apt-pkg/cdrom.cc:783
+#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:792
+#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:832
+#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
msgstr ""
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2551,10 +2545,6 @@ msgstr ""
msgid "Removed with config %s"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr ""
-
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 5ac160a8c..59d3dc6dd 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,171 +1,161 @@
# Catalan translation of APT.
-# Copyright © 2002, 2003, 2004, 2005 Software in the Public Interest, Inc.
+# Copyright © 2002, 2003, 2004, 2005, 2006 Software in the Public Interest, Inc.
# Antoni Bella Perez <bella5@teleline.es>, 2002, 2003.
# Matt Bonner <mateubonet@yahoo.com>, 2003.
-# Jordi Mallach <jordi@debian.org>, 2004, 2005.
+# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-17 19:31+0200\n"
-"PO-Revision-Date: 2005-07-19 01:31+0200\n"
+"POT-Creation-Date: 2006-01-19 00:08+0100\n"
+"PO-Revision-Date: 2006-02-05 22:00+0100\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "El paquet %s versió %s té una dependència sense satisfer:\n"
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
-#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
msgstr "No s'ha trobat el paquet %s"
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:232
msgid "Total package names : "
msgstr "Nombre total de paquets: "
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
msgstr " Paquets normals: "
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
msgstr " Paquets virtuals purs: "
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
msgstr " Paquets virtuals únics: "
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
msgstr " Paquets virtuals mixtes: "
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr " Falten: "
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
msgstr "Total de versions diferents: "
-#: cmdline/apt-cache.cc:293
-#, fuzzy
-msgid "Total Distinct Descriptions: "
-msgstr "Total de versions diferents: "
-
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
msgstr "Total de dependències: "
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
msgstr "Total de relacions versió/fitxer: "
-#: cmdline/apt-cache.cc:300
-#, fuzzy
-msgid "Total Desc/File relations: "
-msgstr "Total de relacions versió/fitxer: "
-
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
msgstr "Total dels mapes aportats: "
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
msgstr "Total de cadenes globals: "
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
msgstr "Total de l'espai per a dependències de versió: "
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
msgstr "Total de l'espai desperdiciat: "
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
msgstr "Total de l'espai atribuit a: "
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr "El fitxer %s del paquet està desincronitzat."
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr "Heu de donar exactament un patró"
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr "No s'han trobat paquets"
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1462
msgid "Package files:"
msgstr "Fitxers de paquets:"
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet"
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr "%4i %s\n"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
msgstr "Paquets etiquetats:"
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr "(no trobat)"
#. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr " Instal·lat: "
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr "(cap)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr " Candidat: "
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
msgstr " Etiqueta del paquet: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1541
msgid " Version table:"
msgstr " Taula de versió:"
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s per a %s %s compilat el %s %s\n"
-#: cmdline/apt-cache.cc:1720
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -209,7 +199,7 @@ msgstr ""
" apt-cache [opcions] showsrc paquet1 [paquet2 ...]\n"
"\n"
"apt-cache és una eina usada per a manipular fitxers binaris en\n"
-"el cau de APT, i així poder consultar-ne la informació\n"
+"el cau d'APT, i així poder consultar-ne la informació\n"
"\n"
"Ordres:\n"
" add - Afegeix un fitxer de paquet a la memòria cau de les fonts\n"
@@ -237,8 +227,19 @@ msgstr ""
" -i Sols mostra dependències importants d'una ordre inadequada.\n"
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de conf arbitrària, p.ex. -o dir::cache=/tmp\n"
-"Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més "
-"informació.\n"
+"Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més informació.\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 2.1r1 Disc 1»"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Inseriu un disc en la unitat i premeu Intro"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repetiu aquest procés per a la resta de CD del vostre joc."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -301,7 +302,7 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "No es pot escriure en %s"
@@ -514,7 +515,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink s'ha arribat al límit de %sB.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "No es pot determinar l'estat de %s"
@@ -523,12 +524,12 @@ msgstr "No es pot determinar l'estat de %s"
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no té una entrada dominant\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
@@ -628,79 +629,79 @@ msgstr "S'ha trobat un problema treient l'enllaç %s"
msgid "Failed to rename %s to %s"
msgstr "No s'ha pogut canviar el nom de %s a %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Els següents paquets tenen dependències sense satisfer:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "però està instal·lat %s"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "però s'instal·larà %s"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "però no és instal·lable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "però és un paquet virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "però no està instal·lat"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "però no serà instal·lat"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "S'instal·laran els següents paquets NOUS:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "S'ELIMINARAN els següents paquets:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "S'han mantingut els següents paquets:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "S'actualitzaran els següents paquets:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Es DESACTUALITZARAN els següents paquets:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Es canviaran els següents paquets mantinguts:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (per %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -708,146 +709,146 @@ msgstr ""
"AVÍS: Els següents paquets essencials seran eliminats.\n"
"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualitzats, %lu nous a instal·lar, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstal·lats, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a eliminar i %lu no actualitzats.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instal·lats o eliminats completament.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "S'estan corregint les dependències..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " ha fallat."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "No es poden corregir les dependències"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "No es pot minimitzar el joc de versions revisades"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Fet"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Dependències sense satisfer. Proveu-ho usant -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVÍS: No es poden autenticar els següents paquets!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr "S'ha descartat l'avís d'autenticació.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr "No s'ha pogut autenticar alguns paquets"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr "Hi ha problemes i s'ha usat -y sense --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
"S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
"trencats!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es necessita obtenir %sB/%sB d'arxius.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es necessita obtenir %sB d'arxius.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No s'ha pogut determinar l'espai lliure en %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr "No teniu prou espai lliure en %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Es va especificar Trivial Only però aquesta operació no és trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Sí, fes el que et dic!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -858,28 +859,28 @@ msgstr ""
"Per a continuar escriviu la frase «%s»\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Avortat."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr "Alguns fitxers no s'han pogut descarregar"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Descàrrega completa i en mode de només descàrrega"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -887,48 +888,48 @@ msgstr ""
"No es poden descarregar alguns arxius, potser executant apt-get update o "
"intenteu-ho amb --fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "No es poden corregir els paquets que falten."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "S'està avortant la instal·lació."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota: s'està seleccionant %s en comptes de %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "El paquet %s és un paquet virtual proveït per:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr " [Instal·lat]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -939,50 +940,50 @@ msgstr ""
"en fa referència. Això normalment vol dir que el paquet falta,\n"
"s'ha tornat obsolet o només és disponible des d'una altra font.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Tot i que els següents paquets el reemplacen:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "El paquet %s no té candidat d'instal·lació"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ja es troba en la versió més recent.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió «%s» per a «%s»"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versió seleccionada %s (%s) per a %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr "L'ordre update no pren arguments"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "No es pot blocar el directori de la llista"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -990,25 +991,25 @@ msgstr ""
"No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc "
"s'han usat els antics."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error intern, AllUpgrade ha trencat coses"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1016,7 +1017,7 @@ msgstr ""
"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
"especifiqueu una solució)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1570
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"
@@ -1028,7 +1029,7 @@ msgstr ""
"unstable i alguns paquets requerits encara no han estat creats o bé\n"
"encara no els hi han afegit."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1578
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"
@@ -1038,119 +1039,124 @@ msgstr ""
"probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n"
"un informe d'error en contra d'aquest per a arxivar-lo."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "La següent informació pot ajudar-vos a resoldre la situació:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "S'instal·laran els següents paquets extres:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"S'ha produït un error intern, el solucionador de problemes ha trencat coses"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a descarregar"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No es pot trobar un paquet de fonts per a %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "S'està ometent el fitxer ja descarregat «%s»\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No teniu prou espai lliure en %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita descarregar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Font descarregada %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut descarregar alguns arxius."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"S'ha d'especificar un paquet per a verificar les dependències de construcció "
"per a"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"No es pot obtenir informació sobre les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1159,7 +1165,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
"paquet %s"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1168,32 +1174,32 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
"s pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
"és massa nou"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2424
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1307,9 +1313,9 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n"
-" '%s'\n"
-"en la unitat de '%s' i premeu Intro\n"
+"El medi ha canviat: inseriu el disc amb l'etiqueta\n"
+" «%s»\n"
+"en la unitat «%s» i premeu Intro\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
@@ -1451,7 +1457,7 @@ msgstr "Fitxer de conf. duplicat %s/%s"
msgid "Failed to write file %s"
msgstr "No s'ha pogut escriure el fitxer %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Ha fallat el tancament del fitxer %s"
@@ -1504,7 +1510,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "No es pot llegir %s"
@@ -1536,9 +1543,9 @@ msgstr ""
"fitxers"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: 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 "S'està llegint la llista de paquets"
@@ -1668,21 +1675,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Fitxer no trobat"
+msgstr "No s'ha trobat el disc"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fitxer no trobat"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
+#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "L'estat ha fallat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-#: methods/rred.cc:240
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "No s'ha pogut establir el temps de modificació"
@@ -1811,7 +1816,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
msgid "Unable to accept connection"
msgstr "No es pot acceptar la connexió"
-#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1947,76 +1952,76 @@ msgstr "No s'ha pogut obrir un conducte per a %s"
msgid "Read error from %s process"
msgstr "Error llegint des del procés %s"
-#: methods/http.cc:345
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "S'estan esperant les capçaleres"
-#: methods/http.cc:491
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters"
-#: methods/http.cc:499
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Línia de capçalera incorrecta"
-#: methods/http.cc:518 methods/http.cc:525
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor http ha enviat una capçalera de resposta no vàlida"
-#: methods/http.cc:554
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida"
-#: methods/http.cc:569
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida"
-#: methods/http.cc:571
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Aquest servidor http té el suport d'abast trencat"
-#: methods/http.cc:595
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:742
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:747
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:770
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error escrivint en el fitxer d'eixida"
-#: methods/http.cc:798
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:823
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:837
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error llegint, el servidor remot ha tancat la connexió"
-#: methods/http.cc:839
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error llegint des del servidor"
-#: methods/http.cc:1070
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1087
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1178
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Error intern"
@@ -2029,7 +2034,7 @@ msgstr "No es pot transferir un fitxer buit a memòria"
msgid "Couldn't make mmap of %lu bytes"
msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
-#: apt-pkg/contrib/strutl.cc:984
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "No s'ha trobat la selecció %s"
@@ -2072,7 +2077,7 @@ msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt
#: apt-pkg/contrib/configuration.cc:691
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include aniuats"
+msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
#, c-format
@@ -2150,7 +2155,7 @@ msgstr "Operació no vàlida %s"
msgid "Unable to stat the mount point %s"
msgstr "No es pot obtenir informació del punt de muntatge %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "No es pot canviar a %s"
@@ -2226,72 +2231,72 @@ msgstr "Ha hagut un problema en desenllaçar el fitxer"
msgid "Problem syncing the file"
msgstr "Ha hagut un problema en sincronitzar el fitxer"
-#: apt-pkg/pkgcache.cc:135
+#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
msgstr "Memòria cau de paquets és buida"
-#: apt-pkg/pkgcache.cc:141
+#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
msgstr "El fitxer de memòria cau de paquets està corromput"
-#: apt-pkg/pkgcache.cc:146
+#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
msgstr "El fitxer de memòria cau de paquets és una versió incompatible"
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Aquest APT no suporta el sistema de versions '%s'"
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Depends"
msgstr "Depén"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
msgstr "Predepén"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
msgstr "Suggereix"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
msgstr "Recomana"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
msgstr "Entra en conflicte"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
msgstr "Reemplaça"
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
msgstr "Fa obsolet"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "important"
msgstr "important"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "required"
msgstr "requerit"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "standard"
msgstr "estàndard"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr "extra"
@@ -2317,52 +2322,52 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Línia %lu malformada en la llista de fonts %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "S'està obrint %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "La línia %u és massa llarga en la llista de fonts %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-#: apt-pkg/sourcelist.cc:191
-#, fuzzy, c-format
+#: apt-pkg/sourcelist.cc:244
+#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)"
@@ -2415,10 +2420,10 @@ msgstr "Falta el directori de llistes %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Falta el directori d'arxiu %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "S'està baixant el fitxer %li de %li (falten %s)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2431,19 +2436,16 @@ msgid "Method %s did not start correctly"
msgstr "El mètode %s no s'ha iniciat correctament"
#: 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 ""
-"El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n"
-" '%s'\n"
-"en la unitat de '%s' i premeu Intro\n"
+msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "El sistema d'empaquetament '%s' no està suportat."
+msgstr "El sistema d'empaquetament '%s' no està suportat"
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
@@ -2488,107 +2490,94 @@ msgstr "La memòria cau té un sistema de versions incompatible"
msgid "Error occurred while processing %s (NewPackage)"
msgstr "S'ha produït un error durant el processament de %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "S'ha produït un error durant el processament de %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:155
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "S'ha produït un error durant el processament de %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "S'ha produït un error durant el processament de %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:219
+#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "S'ha produït un error durant el processament de %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:223
+#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "S'ha produït un error durant el processament de %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:247
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:253
+#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr "Uau, heu excedit el nombre de paquets dels que aquest APT és capaç."
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Uau, heu excedit el nombre de versions de les que aquest APT és capaç. "
-#: apt-pkg/pkgcachegen.cc:259
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Uau, heu excedit el nombre de versions de les que aquest APT és capaç. "
-
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Uau, heu excedit el nombre de dependències de les que aquest APT és capaç."
-#: apt-pkg/pkgcachegen.cc:290
+#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "S'ha produït un error durant el processament de %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:303
+#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
"S'ha produït un error durant el processament de %s (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:309
+#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
-#: apt-pkg/pkgcachegen.cc:679
+#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No s'ha pogut llegir la llista de paquets font %s"
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr "S'estan recollint els fitxers que proveeixen"
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Error d'E/S en desar la memòria cau de la font"
-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635
-#: apt-pkg/acquire-item.cc:1336
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2598,16 +2587,14 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1203
+#: apt-pkg/acquire-item.cc:817
#, 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 ""
-"No ha estat possible localitzar un fitxer pel paquet %s. Això podria "
-"significar que haureu d'arreglar aquest paquet manualment."
+msgstr "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu d'arreglar aquest paquet manualment."
-#: apt-pkg/acquire-item.cc:1239
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2615,16 +2602,16 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
-msgstr "Mida diferent"
+msgstr "La mida no concorda"
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "El camp del proveïdor %s no té una empremta digital"
-#: apt-pkg/cdrom.cc:531
+#: apt-pkg/cdrom.cc:507
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
@@ -2633,49 +2620,47 @@ msgstr ""
"S'està utilitzant el punt de muntatge de CD-ROM %s\n"
"S'està muntant el CD-ROM\n"
-#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr "S'està identificant..."
-#: apt-pkg/cdrom.cc:565
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr "S'està desmuntant el CD-ROM\n"
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
msgstr "S'està esperant al disc...\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr "S'està muntant el CD-ROM...\n"
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr "S'està analitzant el disc per a fitxers d'índex...\n"
-#: apt-pkg/cdrom.cc:673
-#, fuzzy, c-format
-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "S'han trobat %i índex de paquets, %i índex de fonts i %i signatures\n"
-#: apt-pkg/cdrom.cc:737
+#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n"
-#: apt-pkg/cdrom.cc:753
+#: apt-pkg/cdrom.cc:726
#, c-format
msgid ""
"This disc is called: \n"
@@ -2684,38 +2669,38 @@ msgstr ""
"El disc es diu:\n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:757
+#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
msgstr "S'estan copiant les llistes de paquets..."
-#: apt-pkg/cdrom.cc:783
+#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
msgstr "S'està escrivint una nova llista de fonts\n"
-#: apt-pkg/cdrom.cc:792
+#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
-#: apt-pkg/cdrom.cc:832
+#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
msgstr "S'esta desmuntant el CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
msgstr "S'han escrit %i registres.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2723,76 +2708,59 @@ msgstr ""
"coincidents\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "S'està obrint %s"
+msgstr "S'està preparant %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "S'està obrint %s"
+msgstr "S'està desempaquetant %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "S'està obrint el fitxer de configuració %s"
+msgstr "S'està preparant per a configurar %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "S'està connectant amb %s"
+msgstr "S'està configurant %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instal·lat: "
+msgstr "S'ha instal·lat %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "S'està preparant per a l'eliminació de %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "S'està obrint %s"
+msgstr "S'està eliminant %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Recomana"
+msgstr "S'ha eliminat %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "S'està preparant per a eliminar amb la configuració %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
-
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "No s'ha pogut obrir el fitxer %s"
+msgstr "S'ha eliminat amb la configuració %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "La connexió s'ha tancat prematurament"
-#, fuzzy
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr ""
-#~ "El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n"
-#~ " '%s'\n"
-#~ "en la unitat de '%s' i premeu Intro\n"
-
-#, fuzzy
-#~ msgid "Skiping already downloaded file '%s'\n"
-#~ msgstr ""
-#~ "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
-
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
#~ "ID del proveïdor '%s' desconeguda en la línia %u de la llista de fonts %s"
diff --git a/po/cs.po b/po/cs.po
index efaac2f1e..1eb240882 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-17 19:31+0200\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-12-30 15:44+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -14,155 +14,145 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Balík %s verze %s má nesplněné závislosti:\n"
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
-#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:232
msgid "Total package names : "
msgstr "Celkem názvů balíků: "
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
msgstr " Normálních balíků: "
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
msgstr " Čistě virtuálních balíků: "
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
msgstr " Jednoduchých virtuálních balíků: "
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
msgstr " Smíšených virtuálních balíků: "
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr " Chybějících: "
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
msgstr "Celkem různých verzí: "
-#: cmdline/apt-cache.cc:293
-#, fuzzy
-msgid "Total Distinct Descriptions: "
-msgstr "Celkem různých verzí: "
-
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
msgstr "Celkem závislostí: "
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
msgstr "Celkem vztahů ver/soubor: "
-#: cmdline/apt-cache.cc:300
-#, fuzzy
-msgid "Total Desc/File relations: "
-msgstr "Celkem vztahů ver/soubor: "
-
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
msgstr "Celkem poskytnutých mapování: "
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
msgstr "Celkem globovaných řetězců: "
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
msgstr "Celkem místa závislých verzí: "
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
msgstr "Celkem jalového místa: "
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
msgstr "Celkem přiřazeného místa: "
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr "Soubor balíku %s je špatně synchronizovaný."
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr "Musíte zadat právě jeden vzor"
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr "Nebyly nalezeny žádné balíky"
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1462
msgid "Package files:"
msgstr "Soubory balíku:"
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku"
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr "%4i %s\n"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
msgstr "Vypíchnuté balíky:"
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr "(nenalezeno)"
#. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr " Instalovaná verze: "
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr "(žádná)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr " Kandidát: "
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
msgstr " Vypíchnutý balík: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1541
msgid " Version table:"
msgstr " Tabulka verzí:"
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s pro %s %s zkompilován na %s %s\n"
-#: cmdline/apt-cache.cc:1720
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -236,6 +226,18 @@ msgstr ""
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
"Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Zadejte prosím název tohoto média, např. 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Vložte prosím médium do mechaniky a stiskněte enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Tento proces opakujte pro všechna zbývající média."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumenty nejsou v párech"
@@ -296,7 +298,7 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Nemohu zapsat do %s"
@@ -508,7 +510,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Odlinkovací limit %sB dosažen.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Nemohu vyhodnotit %s"
@@ -517,12 +519,12 @@ msgstr "Nemohu vyhodnotit %s"
msgid "Archive had no package field"
msgstr "Archiv nemá pole Package"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žádnou položku pro override\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
@@ -622,79 +624,79 @@ msgstr "Problém s odlinkováním %s"
msgid "Failed to rename %s to %s"
msgstr "Selhalo přejmenování %s na %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Následující balíky mají nesplněné závislosti:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "ale %s je nainstalován"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s se bude instalovat"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "ale nedá se nainstalovat"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "ale je to virtuální balík"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "ale není nainstalovaný"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "ale nebude se instalovat"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " nebo"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Následující NOVÉ balíky budou nainstalovány:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Následující balíky budou ODSTRANĚNY:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Následující balíky budou aktualizovány:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Následující balíky budou DEGRADOVÁNY:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Následující podržené balíky budou změněny:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvůli %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -702,144 +704,144 @@ msgstr ""
"VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n"
"Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizováno, %lu nově instalováno, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalováno, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Opravuji závislosti..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " selhalo."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Nemohu opravit závislosti"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Nemohu minimalizovat sadu pro aktualizaci"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Hotovo"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Pro opravení můžete spustit `apt-get -f install'."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Nesplněné závislosti. Zkuste použít -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr "Autentizační varování potlačeno.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "Instalovat tyto balíky bez ověření [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr "Některé balíky nemohly být autentizovány"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB archivů.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Potřebuji stáhnout %sB archivů.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Po rozbalení bude na disku použito dalších %sB.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozbalení bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nemohu určit volné místo v %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr "V %s nemáte dostatek volného místa."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Udáno 'pouze triviální', ovšem toto není triviální operace."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Ano, udělej to tak, jak říkám!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -850,28 +852,28 @@ msgstr ""
"Pro pokračování opište frázi '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Přerušeno."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -879,47 +881,47 @@ msgstr ""
"Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
"fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Nemohu opravit chybějící balíky."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Přerušuji instalaci."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Pozn: Vybírám %s místo %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Přeskakuji %s, protože je již nainstalován.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Balík %s je virtuální balík poskytovaný:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr "[Instalovaný]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Měli byste explicitně vybrat jeden k instalaci."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -930,49 +932,49 @@ msgstr ""
"To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n"
"pouze z jiného zdroje\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Nicméně následující balíky jej nahrazují:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Balík %s nemá kandidáta pro instalaci"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je již nejnovější verze.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Vydání '%s' pro '%s' nebylo nalezeno"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Verze '%s' pro '%s' nebyla nalezena"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vybraná verze %s (%s) pro %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -980,25 +982,25 @@ msgstr ""
"Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou "
"použity starší verze."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pro opravení následujících můžete spustit `apt-get -f install':"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1006,7 +1008,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1570
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"
@@ -1017,7 +1019,7 @@ msgstr ""
"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1578
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"
@@ -1027,123 +1029,128 @@ msgstr ""
"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
"(bug report)."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Následující extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení '%s' selhal.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
"pro sestavení"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1152,31 +1159,31 @@ msgstr ""
"%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
"%s, která odpovídá požadavku na verzi"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění %s závislosti pro %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pro sestavení %s nemohly být splněny."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2424
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1427,7 +1434,7 @@ msgstr "Duplicitní konfigurační soubor %s/%s"
msgid "Failed to write file %s"
msgstr "Selhal zápis souboru %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Selhalo zavření souboru %s"
@@ -1480,7 +1487,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Soubor %s/%s přepisuje ten z balíku %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Nemohu číst %s"
@@ -1510,9 +1518,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Adresáře info a temp musí být na stejném souborovém systému"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: 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 "Čtu seznamy balíků"
@@ -1649,13 +1657,12 @@ msgstr "Disk nebyl nalezen."
msgid "File not found"
msgstr "Soubor nebyl nalezen"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
+#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Selhalo vyhodnocení"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-#: methods/rred.cc:240
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Nelze nastavit čas modifikace"
@@ -1783,7 +1790,7 @@ msgstr "Spojení datového socketu vypršelo"
msgid "Unable to accept connection"
msgstr "Nemohu přijmout spojení"
-#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
@@ -1915,76 +1922,76 @@ msgstr "Nemohu otevřít rouru pro %s"
msgid "Read error from %s process"
msgstr "Chyba čtení z procesu %s"
-#: methods/http.cc:345
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Čekám na hlavičky"
-#: methods/http.cc:491
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
-#: methods/http.cc:499
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:518 methods/http.cc:525
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnou hlavičku odpovědi"
-#: methods/http.cc:554
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnou hlavičku Content-Length"
-#: methods/http.cc:569
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnou hlavičku Content-Range"
-#: methods/http.cc:571
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/http.cc:595
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:742
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:747
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:770
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:798
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:823
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:837
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:839
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:1070
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1087
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1178
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -1997,7 +2004,7 @@ msgstr "Nemohu provést mmap prázdného souboru"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nešlo mmapovat %lu bajtů"
-#: apt-pkg/contrib/strutl.cc:984
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
@@ -2119,7 +2126,7 @@ msgstr "Neplatná operace %s"
msgid "Unable to stat the mount point %s"
msgstr "Nelze vyhodnotit přípojný bod %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Nemohu přejít do %s"
@@ -2195,72 +2202,72 @@ msgstr "Problém při odstraňování souboru"
msgid "Problem syncing the file"
msgstr "Problém při synchronizování souboru"
-#: apt-pkg/pkgcache.cc:135
+#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
msgstr "Cache balíků je prázdná"
-#: apt-pkg/pkgcache.cc:141
+#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
msgstr "Cache soubor balíků je poškozen"
-#: apt-pkg/pkgcache.cc:146
+#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
msgstr "Cache soubor balíků je v nekompatibilní verzi"
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Tento APT nepodporuje systém pro správu verzí '%s'"
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
msgstr "Cache balíků byla vytvořena pro jinou architekturu"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Depends"
msgstr "Závisí na"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
msgstr "Předzávisí na"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
msgstr "Navrhuje"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
msgstr "Doporučuje"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
msgstr "Koliduje s"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
msgstr "Nahrazuje"
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
msgstr "Zastarává"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "important"
msgstr "důležitý"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "required"
msgstr "vyžadovaný"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "standard"
msgstr "standardní"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "optional"
msgstr "volitelný"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr "extra"
@@ -2286,52 +2293,52 @@ msgstr "Nelze zpracovat soubor %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nelze zpracovat soubor %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "Otevírám %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)"
@@ -2380,7 +2387,7 @@ msgstr "Adresář seznamů %spartial chybí."
msgid "Archive directory %spartial is missing."
msgstr "Archivní adresář %spartial chybí."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Stahuji soubor %li z %li (%s zbývá)"
@@ -2400,12 +2407,12 @@ msgstr "Metoda %s nebyla spuštěna správně"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter."
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Balíčkovací systém '%s' není podporován"
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
@@ -2449,104 +2456,92 @@ msgstr "Cache má nekompatibilní systém správy verzí"
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Při zpracování %s se objevila chyba (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Při zpracování %s se objevila chyba (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:155
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Při zpracování %s se objevila chyba (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Při zpracování %s se objevila chyba (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:219
+#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Při zpracování %s se objevila chyba (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:223
+#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Při zpracování %s se objevila chyba (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:247
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:253
+#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Wow, překročili jste počet jmen balíků, které tato APT zvládá zpracovat."
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat."
-#: apt-pkg/pkgcachegen.cc:259
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat."
-
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Wow, překročili jste počet závislostí, které tato APT zvládá zpracovat."
-#: apt-pkg/pkgcachegen.cc:290
+#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Chyba při zpracování %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:303
+#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:309
+#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Při zpracování závislostí nebyl nalezen balík %s %s"
-#: apt-pkg/pkgcachegen.cc:679
+#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "Chyba IO při ukládání zdrojové cache"
-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635
-#: apt-pkg/acquire-item.cc:1336
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2555,7 +2550,7 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
"tento balík je třeba opravit ručně (kvůli chybějící architektuře)"
-#: apt-pkg/acquire-item.cc:1203
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2564,14 +2559,14 @@ msgstr ""
"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:1239
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
@@ -2580,7 +2575,7 @@ msgstr "Velikosti nesouhlasí"
msgid "Vendor block %s contains no fingerprint"
msgstr "Blok výrobce %s neobsahuje otisk klíče"
-#: apt-pkg/cdrom.cc:531
+#: apt-pkg/cdrom.cc:507
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
@@ -2589,49 +2584,47 @@ msgstr ""
"Používám přípojný bod %s\n"
"Připojuji CD-ROM\n"
-#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr "Rozpoznávám... "
-#: apt-pkg/cdrom.cc:565
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr "Uložený název: %s \n"
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Používám přípojný bod %s\n"
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr "Odpojuji CD-ROM\n"
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
msgstr "Čekám na disk...\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr "Připojuji CD-ROM...\n"
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr "Hledám na disku indexové soubory...\n"
-#: apt-pkg/cdrom.cc:673
-#, fuzzy, c-format
-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i) a podpisy (%i)\n"
-#: apt-pkg/cdrom.cc:737
+#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
msgstr "Nejedná se o platné jméno, zkuste to znovu.\n"
-#: apt-pkg/cdrom.cc:753
+#: apt-pkg/cdrom.cc:726
#, c-format
msgid ""
"This disc is called: \n"
@@ -2640,38 +2633,38 @@ msgstr ""
"Tento disk se nazývá: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:757
+#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
msgstr "Kopíruji seznamy balíků..."
-#: apt-pkg/cdrom.cc:783
+#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
msgstr "Zapisuji nový seznam balíků\n"
-#: apt-pkg/cdrom.cc:792
+#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
msgstr "Seznamy zdrojů na tomto disku jsou:\n"
-#: apt-pkg/cdrom.cc:832
+#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
msgstr "Odpojuji CD-ROM..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapsal jsem %i záznamů.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapsal jsem %i záznamů s chybějícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapsal jsem %i záznamů s nesouhlasícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2727,24 +2720,6 @@ msgstr "Připravuji odstranění %s včetně konfiguračních souborů"
msgid "Removed with config %s"
msgstr "Odstraněn %s včetně konfiguračního souboru"
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Nemohu otevřít soubor %s"
-
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Spojení bylo předčasně ukončeno"
-
-#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-#~ msgstr "Zadejte prosím název tohoto média, např. 'Debian 2.1r1 Disk 1'"
-
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr "Vložte prosím médium do mechaniky a stiskněte enter"
-
-#~ msgid "Repeat this process for the rest of the CDs in your set."
-#~ msgstr "Tento proces opakujte pro všechna zbývající média."
-
-#, fuzzy
-#~ msgid "Skiping already downloaded file '%s'\n"
-#~ msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
diff --git a/po/da.po b/po/da.po
index 42669e394..62f6b6563 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,173 +2,163 @@
# translation of da.po to Danish
# Advanced Package Transfer - APT message translation catalog
# Danish messages
-# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005.
#
+# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005, 2006.
msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-17 19:31+0200\n"
-"PO-Revision-Date: 2005-11-07 15:28+0100\n"
+"POT-Creation-Date: 2006-01-19 00:08+0100\n"
+"PO-Revision-Date: 2006-01-20 22:23+0100\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Pakken %s version %s har en uopfyldt afhngighed:\n"
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
-#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
msgstr "Kunne ikke lokalisere pakken %s"
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:232
msgid "Total package names : "
msgstr "Totale pakkenavne : "
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
msgstr " Normale pakker: "
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
msgstr " Rene virtuelle pakker: "
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
msgstr " Enkelte virtuelle pakker: "
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
msgstr " Blandede virtuelle pakker: "
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr " Manglende: "
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
msgstr "Totale forskellige versioner: "
-#: cmdline/apt-cache.cc:293
-#, fuzzy
-msgid "Total Distinct Descriptions: "
-msgstr "Totale forskellige versioner: "
-
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
msgstr "Totale afhngigheder: "
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
msgstr "Totale version/fil-relationer: "
-#: cmdline/apt-cache.cc:300
-#, fuzzy
-msgid "Total Desc/File relations: "
-msgstr "Totale version/fil-relationer: "
-
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
msgstr "Totale 'tilbyder'-markeringer: "
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
msgstr "Totalle sgemnsterstrenge: "
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
msgstr "Total afhngighedsversions-plads: "
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
msgstr "Total 'Slack'-plads: "
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
msgstr "Total plads, der kan gres rede for: "
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefilen %s er ude af trit."
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr "Du skal angive njagtig t mnster"
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr "Fandt ingen pakker"
# Overskriften til apt-cache policy,
# forkorter "Package" vk. CH
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1462
msgid "Package files:"
msgstr "Pakkefiler:"
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr "%4i %s\n"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
msgstr "'Pinned' pakker:"
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr "(ikke fundet)"
#. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr " Installeret: "
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr "(ingen)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr " Kandidat: "
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
msgstr " Pakke-pin: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1541
msgid " Version table:"
msgstr " Versionstabel:"
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s oversat p %s %s\n"
-#: cmdline/apt-cache.cc:1720
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -242,6 +232,18 @@ msgstr ""
" -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n"
"Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Indst en disk i drevet og tryk retur"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Gentag processen for resten af cd'erne i dit st."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Parametre ikke angivet i par"
@@ -303,7 +305,7 @@ msgstr ""
" -c=? Ls denne opstningsfil\n"
" -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Kunne ikke skrive til %s"
@@ -515,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Nede DeLink-begrnsningen p %sB.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Kunne ikke finde %s"
@@ -524,12 +526,12 @@ msgstr "Kunne ikke finde %s"
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen tvangs-post\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
@@ -629,79 +631,79 @@ msgstr "Problem under aflnkning af %s"
msgid "Failed to rename %s to %s"
msgstr "Kunne ikke omdbe %s til %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulrt udtryk - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Flgende pakker har uopfyldte afhngigheder:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "men %s er installeret"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "men %s forventes installeret"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "men den kan ikke installeres"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "men det er en virtuel pakke"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "men den er ikke installeret"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "men den bliver ikke installeret"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Flgende NYE pakker vil blive installeret:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Flgende pakker vil blive AFINSTALLERET:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Flgende pakker er blevet holdt tilbage:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Flgende pakker vil blive opgraderet:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Flgende pakker vil blive NEDGRADERET:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Flgende tilbageholdte pakker vil blive ndret:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (grundet %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -709,143 +711,143 @@ msgstr ""
"ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n"
"Dette br IKKE ske medmindre du er helt klar over, hvad du laver!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu opgraderes, %lu nyinstalleres, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstalleres, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderes, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikke fuldstndigt installerede eller afinstallerede.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Retter afhngigheder..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " mislykkedes."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Kunne ikke rette afhngigheder"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Kunne ikke minimere opgraderingssttet"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Frdig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Uopfyldte afhngigheder. Prv med -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Flgende pakkers autensitet kunne ikke verificeres!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr "Autentifikationsadvarsel tilsidesat.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "Installr disse pakker uden verifikation (y/N)? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr "Nogle pakker kunne ikke autentificeres"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr "Der er problemer og -y blev brugt uden --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Intern fejl. InstallPackages blev kaldt med delagte pakker!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldfrt"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr "Kunne ikke lse nedhentningsmappen"
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke lses."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "Mystisk.. Strrelserne passede ikke, skriv til apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "%sB/%sB skal hentes fra arkiverne.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB skal hentes fra arkiverne.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har ikke nok ledig plads i %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Ja, gr som jeg siger!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -856,28 +858,28 @@ msgstr ""
"For at fortstte, skal du skrive '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Afbryder."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortstte [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -885,49 +887,49 @@ msgstr ""
"Kunne ikke hente nogle af arkiverne. Prv evt. at kre 'apt-get update' "
"eller prv med --fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og medieskift understttes endnu ikke"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Kunne ikke rette manglende pakker."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Afbryder installationen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Bemrk, at %s vlges fremfor %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Overspringer %s, da den allerede er installeret og opgradering er "
"deaktiveret.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakken %s er ikke installeret, s den afinstalleres ikke\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr " [Installeret]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Du br eksplicit vlge en at installere."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -938,49 +940,49 @@ msgstr ""
"anden pakke. Det kan betyde at denne pakke blevet overfldiggjort eller \n"
"kun kan hentes fra andre kilder\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Dog kan flgende pakker erstatte den:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakken %s har ingen installationskandidat"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s er i forvejen den nyeste version.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Udgaven '%s' for '%s' blev ikke fundet"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Versionen '%s' for '%s' blev ikke fundet"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Valgte version %s (%s) af %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr "'update'-kommandoen benytter ingen parametre"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Kunne ikke lse listemappen"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -988,25 +990,25 @@ msgstr ""
"Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle "
"bruges i stedet."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade delagde noget"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1014,7 +1016,7 @@ msgstr ""
"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
"en lsning)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1570
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1025,7 +1027,7 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilgngelige."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1578
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
@@ -1034,122 +1036,126 @@ msgstr ""
"Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n"
"ikke installeres og du br indsende en fejlrapport for denne pakke."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Flgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Foreslede pakker:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemlseren delagde noget"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst n pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Overspringer allerede hentet fil '%s'\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plads i %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhngigheder.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-msgstr ""
-"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
+msgstr "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1158,32 +1164,32 @@ msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhngighederne"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Understttede moduler:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2424
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1350,14 +1356,11 @@ msgstr "pakker, der blev installeret. Det kan give gentagne fejl"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-"eller fejl, der skyldes manglende afhngigheder. Dette er o.k. Det er kun"
+msgstr "eller fejl, der skyldes manglende afhngigheder. Dette er o.k. Det er kun"
#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-"fejlene over denne besked, der er vigtige. Ret dem og kr [I]nstallr igen"
+msgid "above this message are important. Please fix them and run [I]nstall again"
+msgstr "fejlene over denne besked, der er vigtige. Ret dem og kr [I]nstallr igen"
#: dselect/update:30
msgid "Merging available information"
@@ -1440,7 +1443,7 @@ msgstr "Dobbelt opstningsfil %s/%s"
msgid "Failed to write file %s"
msgstr "Kunne ikke skrive filen %s"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Kunne ikke lukke filen %s"
@@ -1493,7 +1496,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "File %s/%s overskriver filen i pakken %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kunne ikke lse %s"
@@ -1523,9 +1527,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Mapperne info og temp skal ligge i samme filsystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: 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 "Indlser pakkelisterne"
@@ -1613,8 +1617,7 @@ msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler '%s'-elementet"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"Dette er ikke et gyldigt DEB-arkiv, det har intet'%s- eller %s-elementet"
+msgstr "Dette er ikke et gyldigt DEB-arkiv, det har intet'%s- eller %s-elementet"
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1663,13 +1666,12 @@ msgstr "Disk blev ikke fundet."
msgid "File not found"
msgstr "Fil blev ikke fundet"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
+#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Kunne ikke finde"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-#: methods/rred.cc:240
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Kunne ikke angive ndringstidspunkt"
@@ -1797,7 +1799,7 @@ msgstr "Tidsudlb p datasokkel-forbindelse"
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1886,10 +1888,8 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-"Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!"
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
@@ -1930,77 +1930,76 @@ msgstr "Kunne ikke bne datarr for %s"
msgid "Read error from %s process"
msgstr "Lsefejl fra %s-process"
-#: methods/http.cc:345
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Afventer hoveder"
-#: methods/http.cc:491
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fandt en enkelt linje i hovedet p over %u tegn"
-#: methods/http.cc:499
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Ugyldig linje i hovedet"
-#: methods/http.cc:518 methods/http.cc:525
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http-serveren sendte et ugyldigt svarhovede"
-#: methods/http.cc:554
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
-#: methods/http.cc:569
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
-#: methods/http.cc:571
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
-msgstr ""
-"Denne http-servere har fejlagtig understttelse af intervaller ('ranges')"
+msgstr "Denne http-servere har fejlagtig understttelse af intervaller ('ranges')"
-#: methods/http.cc:595
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:742
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:747
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsudlb p forbindelsen"
-#: methods/http.cc:770
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:798
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:823
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:837
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:839
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fejl ved lsning fra server"
-#: methods/http.cc:1070
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1087
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1178
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Intern fejl"
@@ -2013,7 +2012,7 @@ msgstr "Kan ikke udfre mmap for en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke udfre mmap for %lu byte"
-#: apt-pkg/contrib/strutl.cc:984
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
@@ -2134,7 +2133,7 @@ msgstr "Ugyldig handling %s"
msgid "Unable to stat the mount point %s"
msgstr "Kunne ikke finde monteringspunktet %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kunne ikke skifte til %s"
@@ -2210,72 +2209,72 @@ msgstr "Fejl ved frigivelse af filen"
msgid "Problem syncing the file"
msgstr "Problem under synkronisering af fil"
-#: apt-pkg/pkgcache.cc:135
+#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
msgstr "Tomt pakke-mellemlager"
-#: apt-pkg/pkgcache.cc:141
+#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
msgstr "Pakke-mellemlagerets fil er delagt"
-#: apt-pkg/pkgcache.cc:146
+#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
msgstr "Pakke-mellemlagerets fil er af en inkompatibel version"
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Denne APT understtter ikke versionssystemet '%s'"
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Depends"
msgstr "Afhngigheder"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
msgstr "Pr-afhngigheder"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
msgstr "Foreslede"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
msgstr "Anbefalede"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
msgstr "Konflikter"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
msgstr "Erstatter"
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
msgstr "Overfldiggr"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "important"
msgstr "vigtig"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "required"
msgstr "krvet"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "optional"
msgstr "frivillig"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr "ekstra"
@@ -2301,52 +2300,52 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kunne ikke tolke pakkefilen %s (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "bner %s"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Linjen %u er for lang i kildelisten %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ugyldig linje %u i kildelisten %s (type)"
-#: apt-pkg/sourcelist.cc:191
-#, fuzzy, c-format
+#: apt-pkg/sourcelist.cc:244
+#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen '%s' er ukendt p linje %u i kildelisten %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Ugyldig linje %u i kildelisten %s (producent-id)"
@@ -2370,10 +2369,8 @@ msgstr "Indeksfiler af typen '%s' understttes ikke"
#: 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 ""
-"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
#: apt-pkg/algorithms.cc:1059
msgid ""
@@ -2385,8 +2382,7 @@ msgstr ""
#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Kunne ikke korrigere problemerne, da du har tilbageholdt delagte pakker."
+msgstr "Kunne ikke korrigere problemerne, da du har tilbageholdt delagte pakker."
#: apt-pkg/acquire.cc:62
#, c-format
@@ -2398,7 +2394,7 @@ msgstr "Listemappen %spartial mangler."
msgid "Archive directory %spartial is missing."
msgstr "Arkivmappen %spartial mangler."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Henter fil %li ud af %li (%s tilbage)"
@@ -2418,12 +2414,12 @@ msgstr "Metoden %s startede ikke korrekt"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur."
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet '%s' understttes ikke"
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunne ikke bestemme en passende pakkesystemtype"
@@ -2466,104 +2462,90 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Der skete en fejl under behandlingen af %s (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:155
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:219
+#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:223
+#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:247
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:253
+#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Hold da op! Du nede over det antal pakkenavne, denne APT kan hndtere."
+msgstr "Hold da op! Du nede over det antal pakkenavne, denne APT kan hndtere."
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere."
-#: apt-pkg/pkgcachegen.cc:259
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere."
-
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere."
+msgstr "Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere."
-#: apt-pkg/pkgcachegen.cc:290
+#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:303
+#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
-#: apt-pkg/pkgcachegen.cc:309
+#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhngigheder"
-#: apt-pkg/pkgcachegen.cc:679
+#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunne ikke finde kildepakkelisten %s"
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr "Samler filudbud"
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "IO-fejl ved gemning af kilde-mellemlageret"
-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "omdbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635
-#: apt-pkg/acquire-item.cc:1336
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2572,7 +2554,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:1203
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2581,13 +2563,12 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:1239
+#: 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 "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Strrelsen stemmer ikke"
@@ -2596,7 +2577,7 @@ msgstr "Strrelsen stemmer ikke"
msgid "Vendor block %s contains no fingerprint"
msgstr "Leverandrblok %s inderholder intet fingeraftryk"
-#: apt-pkg/cdrom.cc:531
+#: apt-pkg/cdrom.cc:507
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
@@ -2605,49 +2586,47 @@ msgstr ""
"Bruger cdrom-monteringspunktet %s\n"
"Monterer cdrom\n"
-#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr "Identificerer.. "
-#: apt-pkg/cdrom.cc:565
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr "Gemt mrkat: %s \n"
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Bruger cdrom-monteringspunktet %s\n"
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr "Afmonterer cdrom\n"
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
msgstr "Venter p disken...\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr "Monterer cdrom...\n"
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr "Skanner disken for indeksfiler..\n"
-#: apt-pkg/cdrom.cc:673
-#, fuzzy, c-format
-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n"
-#: apt-pkg/cdrom.cc:737
+#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikke et gyldigt navn, prv igen.\n"
-#: apt-pkg/cdrom.cc:753
+#: apt-pkg/cdrom.cc:726
#, c-format
msgid ""
"This disc is called: \n"
@@ -2656,38 +2635,38 @@ msgstr ""
"Denne disk hedder: \n"
" %s \n"
-#: apt-pkg/cdrom.cc:757
+#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
msgstr "Kopierer pakkelisterne..."
-#: apt-pkg/cdrom.cc:783
+#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
msgstr "Skriver ny kildeliste\n"
-#: apt-pkg/cdrom.cc:792
+#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
msgstr "Denne disk har flgende kildeliste-indgange:\n"
-#: apt-pkg/cdrom.cc:832
+#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
msgstr "Afmonterer cdrom..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i manglende filer.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i ikke-trufne filer\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
@@ -2742,28 +2721,10 @@ msgstr "Gr klar til at fjerne %s inklusive opstning"
msgid "Removed with config %s"
msgstr "Fjernede %s inklusive opstning"
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Kunne ikke bne filen %s"
-
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Forbindelsen lukkedes for hurtigt"
-#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-#~ msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'"
-
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr "Indst en disk i drevet og tryk retur"
-
-#~ msgid "Repeat this process for the rest of the CDs in your set."
-#~ msgstr "Gentag processen for resten af cd'erne i dit st."
-
-#, fuzzy
-#~ msgid "Skiping already downloaded file '%s'\n"
-#~ msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Ukendt leverandr-ID '%s' p linje %u i kildelisten %s"
@@ -3010,3 +2971,4 @@ msgstr "Forbindelsen lukkedes for hurtigt"
#~ msgid "Errors apply to file '%s'"
#~ msgstr "Fejlene vedrrer filen '%s'"
+
diff --git a/po/de.po b/po/de.po
index 4d612040a..5c38b8837 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-17 19:31+0200\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-06-15 18:22+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -15,155 +15,145 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Paket %s Version %s hat eine nichterfüllte Abhängigkeit:\n"
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
-#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
msgstr "Kann Paket %s nicht finden"
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:232
msgid "Total package names : "
msgstr "Gesamtzahl an Paketnamen: "
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
msgstr " davon gewöhnliche Pakete: "
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
msgstr " davon rein virtuelle Pakete: "
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
msgstr " davon einzelne virtuelle Pakete: "
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
msgstr " davon gemischte virtuelle Pakete: "
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr " davon fehlend: "
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
msgstr "Gesamtzahl an unterschiedlichen Versionen: "
-#: cmdline/apt-cache.cc:293
-#, fuzzy
-msgid "Total Distinct Descriptions: "
-msgstr "Gesamtzahl an unterschiedlichen Versionen: "
-
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
msgstr "Gesamtzahl an Abhängigkeiten: "
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
-#: cmdline/apt-cache.cc:300
-#, fuzzy
-msgid "Total Desc/File relations: "
-msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
-
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
msgstr "Gesamtzahl an Bereitstellungen: "
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
msgstr "Gesamtzahl an Mustern: "
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
msgstr "Gesamtmenge an Abhängigkeits/Versionsspeicher: "
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
msgstr "Gesamtmenge an Slack: "
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
msgstr "Gesamtmenge an Speicher: "
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr "Paketdatei %s ist nicht synchronisiert."
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr "Sie müssen genau ein Muster angeben"
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr "Keine Pakete gefunden"
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1462
msgid "Package files:"
msgstr "Paketdateien:"
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Cache ist nicht sychron, kann eine Paketdatei nicht querverweisen"
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr "%4i %s\n"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
msgstr "Festgehaltene Pakete (»Pin«):"
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr "(nicht gefunden)"
#. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr " Installiert:"
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr "(keine)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr " Mögliche Pakete:"
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
msgstr " Paketstecknadel: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1541
msgid " Version table:"
msgstr " Versions-Tabelle:"
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s für %s %s kompiliert am %s %s\n"
-#: cmdline/apt-cache.cc:1720
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -238,6 +228,21 @@ msgstr ""
"tmp\n"
"Siehe auch apt-cache(8) und apt.conf(5) für weitere Informationen.\n"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 "
+"Disk 1«"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Argumente nicht paarweise"
@@ -303,7 +308,7 @@ msgstr ""
" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Kann nicht nach %s schreiben"
@@ -523,7 +528,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-Limit von %sB erreicht.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Kann auf %s nicht zugreifen."
@@ -532,12 +537,12 @@ msgstr "Kann auf %s nicht zugreifen."
msgid "Archive had no package field"
msgstr "Archiv hatte kein Paket-Feld"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Maintainer ist %s und nicht %s\n"
@@ -637,79 +642,79 @@ msgstr "Problem beim Unlinking von %s"
msgid "Failed to rename %s to %s"
msgstr "Konnte %s nicht in %s umbenennen"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "aber %s ist installiert"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "aber %s soll installiert werden"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "ist aber nicht installierbar"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "ist aber ein virtuelles Paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "ist aber nicht installiert"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "soll aber nicht installiert werden"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " oder "
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Die folgenden NEUEN Pakete werden installiert:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Die folgenden Pakete werden ENTFERNT:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Die folgenden Pakete werden aktualisiert:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Die folgenden Pakete werden DEAKTUALISIERT:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Die folgenden gehaltenen Pakete werden verändert:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegen %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -718,147 +723,147 @@ msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
"Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu deaktualisiert, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nicht vollständig installiert oder entfernt.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Abhängigkeit werden korrigiert..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " fehlgeschlagen."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Kann Abhängigkeiten nicht korrigieren"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Fertig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu "
"korrigieren."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr "Einige Pakete konnten nicht authentifiziert werden"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!"
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr "Kann kein Lock für das Downloadverzeichnis erhalten."
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Wie merkwürdig... Die Größen haben nicht übereingestimmt, schreiben Sie an "
"apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Es müssen %sB Archive geholt werden.\n"
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Konnte freien Platz in %s nicht bestimmen"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Sie haben nicht genug Platz in %s."
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "»Nur triviale« angegeben, aber das ist keine triviale Operation."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Ja, tu was ich sage!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -869,28 +874,28 @@ msgstr ""
"Zum Fortfahren geben Sie bitte »%s« ein.\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Abbruch."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus"
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -898,48 +903,48 @@ msgstr ""
"Konnte einige Archive nicht herunterladen, vielleicht »apt-get update« oder "
"mit »--fix-missing« probieren?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Konnte fehlende Pakete nicht korrigieren."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Installation abgebrochen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Achtung, wähle %s an Stelle von %s\n"
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Pakete %s ist ein virtuelles Pakete, das bereitgestellt wird von:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr " [Installiert]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Sie sollten eines explizit zum Installieren auswählen."
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -950,51 +955,51 @@ msgstr ""
"Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n"
"ist oder nur aus einer anderen Quelle verfügbar ist.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Doch die folgenden Pakete ersetzen es:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paket %s hat keinen Installationskandidaten"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Re-Installation von %s ist nicht möglich,\n"
"es kann nicht heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ist schon die neueste Version.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release »%s« für »%s« konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Gewählte Version %s (%s) für %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« nimmt keine Argumente"
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -1002,27 +1007,27 @@ msgstr ""
"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
"ignoriert oder alte an ihrer Stelle benutzt."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Achtung, wähle %s für reg. Ausdruck »%s«\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Sie möchten wahrscheinlich »apt-get -f install« aufrufen, um dies zu "
"korrigieren:"
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1030,7 +1035,7 @@ msgstr ""
"Nichterfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
"jeglich Pakete (oder geben Sie eine Lösung an)."
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1570
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"
@@ -1042,7 +1047,7 @@ msgstr ""
"instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"kreiert oder aus Incoming herausbewegt wurden."
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1578
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"
@@ -1053,119 +1058,124 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr ""
"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade..."
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindesten ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen"
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Sie haben nicht genug freien Platz in %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB der Quellarchive geholt werden.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n"
"überprüft werden sollen."
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden."
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Build-Dependencies.\n"
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1174,7 +1184,7 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1183,32 +1193,32 @@ msgstr ""
"%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare "
"Version von Paket %s die Versionsanforderungen erfüllen kann."
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist "
"zu neu."
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-Abhängigkeit für %s konnte nicht erfüllt werden."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2424
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1469,7 +1479,7 @@ msgstr "Doppelte Konfigurationsdatei %s/%s"
msgid "Failed to write file %s"
msgstr "Konnte nicht in Datei %s schreiben"
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Konnte Datei %s nicht schließen"
@@ -1522,7 +1532,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Datei %s/%s überschreibt die Datei in Paket %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kann %s nicht lesen"
@@ -1553,9 +1564,9 @@ msgstr ""
"Die »info«- und »temp«-Verzeichnisse müssen im selben Dateisystem liegen"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: 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 "Paketlisten werden gelesen"
@@ -1697,13 +1708,12 @@ msgid "File not found"
msgstr "Datei nicht gefunden"
# looks like someone hardcoded English grammar
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
+#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Kann nicht zugreifen."
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-#: methods/rred.cc:240
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Kann Änderungszeitpunkt nicht setzen"
@@ -1832,7 +1842,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
msgid "Unable to accept connection"
msgstr "Kann Verbindung nicht annehmen"
-#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
@@ -1965,78 +1975,78 @@ msgstr "Konnte keine Pipe für %s öffnen"
msgid "Read error from %s process"
msgstr "Lesefehler von Prozess %s"
-#: methods/http.cc:345
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Warte auf Kopfzeilen (header)"
-#: methods/http.cc:491
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
-#: methods/http.cc:499
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Schlechte Kopfzeile"
-#: methods/http.cc:518 methods/http.cc:525
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile"
-#: methods/http.cc:554
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Der http-Server sandte eine ungültige »Content-Length«-Kopfzeile"
-#: methods/http.cc:569
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Der http-Server sandte eine ungültige »Content-Range«-Kopfzeile"
-#: methods/http.cc:571
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft."
-#: methods/http.cc:595
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:742
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:747
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:770
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben einer Ausgabedatei"
-#: methods/http.cc:798
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:823
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:837
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung "
"geschlossen"
-#: methods/http.cc:839
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1070
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1087
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1178
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2049,7 +2059,7 @@ msgstr "Kann eine leere Datei nicht mit mmap abbilden"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Konnte kein mmap von %lu Bytes durchführen"
-#: apt-pkg/contrib/strutl.cc:984
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
@@ -2171,7 +2181,7 @@ msgstr "Ungültige Operation %s."
msgid "Unable to stat the mount point %s"
msgstr "Kann auf den Einhängepunkt %s nicht zugreifen."
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kann nicht nach %s wechseln"
@@ -2247,72 +2257,72 @@ msgstr "Beim Unlinking Datei trat ein Problem auf"
msgid "Problem syncing the file"
msgstr "Beim Synchronisieren einer Datei trat ein Problem auf"
-#: apt-pkg/pkgcache.cc:135
+#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
msgstr "Leerer Paketcache"
-#: apt-pkg/pkgcache.cc:141
+#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
msgstr "Die Paketcachedatei ist korrumpiert"
-#: apt-pkg/pkgcache.cc:146
+#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
msgstr "Die Paketcachedatei ist in einer inkompatiblen Version"
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Dieses APT unterstützt das Versionssystem »%s« nicht"
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
msgstr "Der Paketcache wurde für eine andere Architektur aufgebaut"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Depends"
msgstr "Hängt ab"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
msgstr "Hängt ab (vorher)"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
msgstr "Schlägt vor"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
msgstr "Empfiehlt"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
msgstr "Kollidiert"
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
msgstr "Ersetzt"
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
msgstr "Veraltet"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "important"
msgstr "wichtig"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "required"
msgstr "erforderlich"
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "optional"
msgstr "optional"
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr "extra"
@@ -2338,52 +2348,52 @@ msgstr "Kann Paketdatei %s nicht parsen (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Kann Paketdatei %s nicht parsen (2)"
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
msgstr "%s wird geöffnet"
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Zeile %u zu lang in der Quellliste %s."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s"
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)"
@@ -2435,7 +2445,7 @@ msgstr "Listenverzeichnis %spartial fehlt."
msgid "Archive directory %spartial is missing."
msgstr "Archivverzeichnis %spartial fehlt."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2458,12 +2468,12 @@ msgstr ""
" »%s«\n"
"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n"
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketierungssystem »%s« wird nicht unterstützt"
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen"
@@ -2511,110 +2521,96 @@ msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut"
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)"
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)"
-#: apt-pkg/pkgcachegen.cc:155
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)"
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:219
+#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:223
+#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:247
-#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:253
+#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Toll, Sie haben die Anzahl an Paketen überschritten, die APT handhaben kann."
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
"Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben "
"kann."
-#: apt-pkg/pkgcachegen.cc:259
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben "
-"kann."
-
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Toll, Sie haben die Anzahl an Abhängigkeiten überschritten, die APT "
"handhaben kann."
-#: apt-pkg/pkgcachegen.cc:290
+#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:303
+#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)"
-#: apt-pkg/pkgcachegen.cc:309
+#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten"
-#: apt-pkg/pkgcachegen.cc:679
+#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen."
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr "Sammle Datei-Empfehlungen ein"
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Sichern des Quellcaches"
-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635
-#: apt-pkg/acquire-item.cc:1336
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2623,7 +2619,7 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)."
-#: apt-pkg/acquire-item.cc:1203
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2632,14 +2628,14 @@ msgstr ""
"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie "
"dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:1239
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/acquire-item.cc:1326
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
@@ -2648,7 +2644,7 @@ msgstr "Größe stimmt nicht"
msgid "Vendor block %s contains no fingerprint"
msgstr "Herstellerblock %s enthält keinen Fingerabdruck"
-#: apt-pkg/cdrom.cc:531
+#: apt-pkg/cdrom.cc:507
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
@@ -2657,49 +2653,47 @@ msgstr ""
"Benutze CD-ROM-Einhängpunkt %s\n"
"Hänge CD ein\n"
-#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr "Identifiziere... "
-#: apt-pkg/cdrom.cc:565
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr "Gespeicherte Kennzeichnung: %s \n"
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Benutze CD-ROM-Einhängpunkt %s\n"
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr "Hänge CD-ROM aus\n"
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
msgstr "Warte auf CD...\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr "Hänge CD-ROM ein...\n"
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr "Suche auf CD nach Index-Dateien...\n"
-#: apt-pkg/cdrom.cc:673
-#, fuzzy, c-format
-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n"
-#: apt-pkg/cdrom.cc:737
+#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n"
-#: apt-pkg/cdrom.cc:753
+#: apt-pkg/cdrom.cc:726
#, c-format
msgid ""
"This disc is called: \n"
@@ -2708,38 +2702,38 @@ msgstr ""
"Diese CD heißt jetzt: \n"
"»%s«\n"
-#: apt-pkg/cdrom.cc:757
+#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
msgstr "Kopiere Paketlisten..."
-#: apt-pkg/cdrom.cc:783
+#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
msgstr "Schreibe neue Quellliste\n"
-#: apt-pkg/cdrom.cc:792
+#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
msgstr "Quelllisteneinträge für diese CD sind:\n"
-#: apt-pkg/cdrom.cc:832
+#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
msgstr "Hänge CD-ROM aus..."
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
msgstr "Es wurden %i Datensätze geschrieben.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2796,32 +2790,10 @@ msgstr ""
msgid "Removed with config %s"
msgstr ""
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Konnte Datei %s nicht öffnen"
-
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Verbindung zu früh beendet"
-#~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-#~ msgstr ""
-#~ "Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.2r1 "
-#~ "Disk 1«"
-
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr ""
-#~ "Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste"
-
-#~ msgid "Repeat this process for the rest of the CDs in your set."
-#~ msgstr ""
-#~ "Wiederholen Sie dieses Prozedere für Ihre restlichen CDs diese Reihe."
-
-#, fuzzy
-#~ msgid "Skiping already downloaded file '%s'\n"
-#~ msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
-
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s"
diff --git a/po/el.po b/po/el.po
index 1d21a3cae..e31414df0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,3 +1,4 @@
+# translation of apt_po_el_new.po to Greek
# translation of apt_po_el.po to
# translation of apt_po_el.po to Greek
# translation of apt_po_el.po to
@@ -7,7 +8,7 @@
# Greek Translation of APT.
# This file is put in the public domain.
# Fanis Dokianakis <madf@hellug.gr>, 2003.
-# Konstantinos Margaritis <markos@debian.org>, 2003, 2004.
+# Konstantinos Margaritis <markos@debian.org>, 2003, 2004, 2006.
# George Papamichelakis <george@step.gr>, 2004.
# George Papamichalakis <george@step.gr>, 2004.
# Greek Translation Team <debian-l10n-greek@lists.debian.org>, 2005.
@@ -15,11 +16,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: apt_po_el\n"
+"Project-Id-Version: apt_po_el_new\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-12-22 23:06+0200\n"
-"Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
+"PO-Revision-Date: 2006-01-18 15:16+0200\n"
+"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -533,7 +534,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Αποσύνδεση ορίου του %sB hit.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
@@ -1113,8 +1114,8 @@ msgstr "Αδυναμία εντοπισμού του κώδικά του πακ
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1701,12 +1702,12 @@ msgstr "Ο δίσκος δεν βρέθηκε."
msgid "File not found"
msgstr "Το αρχείο Δε Βρέθηκε"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Αποτυχία εύρεσης της κατάστασης"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
@@ -1834,7 +1835,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
@@ -1968,77 +1969,77 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το
msgid "Read error from %s process"
msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Αναμονή επικεφαλίδων"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Ελαττωματική γραμμή επικεφαλίδας"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
@@ -2592,11 +2593,15 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2605,7 +2610,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2614,7 +2619,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2622,7 +2627,7 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
diff --git a/po/en_GB.po b/po/en_GB.po
index c681c89f4..fc636658e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2002-11-10 20:56+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en@li.org>\n"
@@ -512,7 +512,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit of %sB hit.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Failed to stat %s"
@@ -679,7 +679,7 @@ msgstr "The following packages will be REMOVED"
#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
-msgstr "The following packages have been kept back"
+msgstr "The following packages have been kept back:"
#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
@@ -855,7 +855,7 @@ msgstr ""
#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
-msgstr "Abort"
+msgstr "Abort."
#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
@@ -1077,9 +1077,9 @@ msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
#: cmdline/apt-get.cc:1959
-#, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Skipping unpack of already unpacked source in %s\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1661,12 +1661,12 @@ msgstr "Disk not found."
msgid "File not found"
msgstr "File not found"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Failed to stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Failed to set modification time"
@@ -1794,7 +1794,7 @@ msgstr "Data socket connect timed out"
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
@@ -1927,76 +1927,76 @@ msgstr "Couldn't open pipe for %s"
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Internal error"
@@ -2536,11 +2536,15 @@ msgstr "IO Error saving source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2549,7 +2553,7 @@ msgstr ""
"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)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2558,14 +2562,14 @@ msgstr ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"The package index files are corrupted. No Filename: field for package %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Size mismatch"
diff --git a/po/es.po b/po/es.po
index d670e2ee3..9dcbeb545 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,10 +6,10 @@
# Rubn Porras Campo <nahoo@inicia.es> 2004
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.5.24\n"
+"Project-Id-Version: apt 0.6.42.3exp1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-02-08 20:36+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
+"PO-Revision-Date: 2005-11-16 17:37+0100\n"
"Last-Translator: Rubn Porras Campo <nahoo@inicia.es>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -342,7 +342,6 @@ msgid "Error processing contents %s"
msgstr "Error procesando contenidos %s"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -384,12 +383,12 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
"Uso: apt-ftparchive [opciones] orden\n"
-"Comandos: packages trayectoria-binaria [archivo-sobrepaso\n"
-" [prefijo-trayectoria]]\n"
-" sources trayectoria-fuente [archivo-sobrepaso \n"
-" [prefijo-trayectoria]]\n"
-" contents trayectoria\n"
-" release trayectoria\n"
+"Comandos: packages ruta-binaria [archivo-predominio\n"
+" [prefijo-ruta]]\n"
+" sources ruta-fuente [archivo-predominio \n"
+" [prefijo-ruta]]\n"
+" contents ruta\n"
+" release ruta\n"
" generate config [grupos]\n"
" clean config\n"
"\n"
@@ -399,7 +398,7 @@ msgstr ""
"\n"
"apt-ftparchive genera ficheros Package de un rbol de .debs. El fichero\n"
"Package contiene los contenidos de todos los campos de control de cada\n"
-"paquete al igual que la suma MD5 y el tamao del archivo. Se soporta\n"
+"paquete al igual que la suma MD5 y el tamao del archivo. Se puede usar\n"
"un archivo de predominio para forzar el valor de Priority y\n"
"Section.\n"
"\n"
@@ -407,7 +406,7 @@ msgstr ""
".dscs. Se puede utilizar la opcin --source-override para especificar un\n"
"fichero de predominio de fuente.\n"
"\n"
-"Las rdenes 'packages' y 'sources' deben ejecutarse en la raz del\n"
+"Las rdenes packages y sources deben ejecutarse en la raz del\n"
"rbol. BinaryPath debe apuntar a la base de la bsqueda\n"
"recursiva, y el archivo de predominio debe de contener banderas de\n"
"predominio. Se aade Pathprefix a los campos de nombre de fichero\n"
@@ -423,7 +422,7 @@ msgstr ""
" -q Silencioso\n"
" -d=? Selecciona la base de datos de cach opcional \n"
" --no-delink Habilita modo de depuracin delink\n"
-" --contents Generacin del contenido del archivo 'Control'\n"
+" --contents Generacin del contenido del archivo Control\n"
" -c=? Lee este archivo de configuracin\n"
" -o=? Establece una opcin de configuracin arbitraria"
@@ -526,7 +525,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink se ha llegado al lmite de %sB.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "No pude leer %s"
@@ -713,13 +712,12 @@ msgid "%s (due to %s) "
msgstr "%s (por %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: Se van a eliminar los siguientes paquetes esenciales\n"
-"Esto NO debe hacerse a menos que sepa exactamente lo que est haciendo!"
+"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
+"NO debe hacerse a menos que sepa exactamente lo que est haciendo!"
#: cmdline/apt-get.cc:577
#, c-format
@@ -780,7 +778,7 @@ msgstr "AVISO: No se han podido autenticar los siguientes paquetes!"
#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Aviso de autenticacin ignorado.\n"
#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
@@ -861,14 +859,14 @@ msgid "Yes, do as I say!"
msgstr "S, haga lo que le 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 ""
"Est a punto de hacer algo potencialmente daino\n"
-"Para continuar escriba la frase '%s'\n"
+"Para continuar escriba la frase %s\n"
" ?] "
#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
@@ -1098,7 +1096,7 @@ msgstr "No se pudo encontrar un paquete de fuentes para %s"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
#: cmdline/apt-get.cc:1983
@@ -1138,7 +1136,7 @@ msgstr "Fall la orden de desempaquetamiento '%s'.\n"
#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Compruebe que el paquete dpkg-dev est instalado.\n"
#: cmdline/apt-get.cc:2086
#, c-format
@@ -1465,9 +1463,9 @@ msgid "Duplicate conf file %s/%s"
msgstr "Archivo de configuracin 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 "Fall el cierre del archivo %s"
+msgstr "Fall la escritura del archivo %s"
#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
@@ -1686,20 +1684,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "No pude desmontar el CD-ROM de %s, tal vez todava este en uso."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Fichero no encontrado"
+msgstr "Disco no encontrado."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fichero no encontrado"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "No pude leer"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "No pude poner el tiempo de modificacin"
@@ -1827,7 +1824,7 @@ msgstr "Expir conexin a socket de datos"
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexin"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
@@ -1914,40 +1911,42 @@ msgstr "No pude conectarme a %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando."
#: methods/gpgv.cc:191
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Error interno: Firma correcta, pero no se pudo determinar su huella digital?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Se encontr al menos una firma invlida."
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "No se pudo bloquear %s"
+msgstr "No se pudo ejecutar "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " para verificar la firma (est instalado gnupg?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Error desconocido ejecutando gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "Se instalarn los siguientes paquetes extras:"
+msgstr "Las siguientes firms fueron invlidas:\n"
#: methods/gpgv.cc:244
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Las firmas siguientes no se pudieron verificar porque su llave pblica no "
+"est disponible:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1959,76 +1958,76 @@ msgstr "No pude abrir una tubera para %s"
msgid "Read error from %s process"
msgstr "Error de lectura de %s procesos"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Obtuve una sola lnea de cabecera arriba de %u caracteres"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Mala lnea de cabecera"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor de http envi una cabecera de respuesta invlida"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor de http envi una cabecera de Content-Length invlida"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor de http envi una cabecera de Content-Range invlida"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "ste servidor de http tiene el soporte de alcance roto"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Fall la seleccin"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Expir la conexin"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerr la conexin."
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Fallo la conexin"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Error interno"
@@ -2374,7 +2373,7 @@ msgid "Malformed line %u in source list %s (type)"
msgstr "Lnea %u mal formada en lista de fuentes %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 "Tipo '%s' desconocido en la lnea %u de lista de fuentes %s"
@@ -2435,7 +2434,7 @@ msgstr "Falta el directorio de archivos %spartial."
#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Descargando fichero %li de %li (falta %s)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2448,12 +2447,9 @@ msgid "Method %s did not start correctly"
msgstr "El mtodo %s no se inici correctamente"
#: 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 ""
-"Cambio de medio: Por favor inserte el disco etiquetado\n"
-" '%s'\n"
-"en la unidad '%s' y presione Intro\n"
+msgstr "Por favor, inserte el disco %s en la unidad %s y presione Intro"
#: apt-pkg/init.cc:120
#, c-format
@@ -2586,11 +2582,15 @@ msgstr "Error de E/S guardando cach fuente"
msgid "rename failed, %s (%s -> %s)."
msgstr "fall el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2600,7 +2600,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2609,7 +2609,7 @@ msgstr ""
"No se pudo localizar un archivo para el paquete %s. Esto puede significar "
"que necesita arreglar manualmente este paquete."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2617,7 +2617,7 @@ msgstr ""
"Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "El tamao difiere"
@@ -2722,54 +2722,54 @@ msgstr ""
"%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Hay problemas abriendo %s"
+msgstr "Preparando %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Abriendo %s"
+msgstr "Desempaquetando %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Abriendo fichero de configuracin %s"
+msgstr "Preparndose para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Conectando a %s"
+msgstr "Configurando %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Instalados: "
+msgstr "%s instalado"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Preparndose para eliminar %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Abriendo %s"
+msgstr "Eliminando %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Recomienda"
+msgstr "%s eliminado"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "Preparndose para eliminar con su configuracin %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Eliminado con su configuracin %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
diff --git a/po/eu.po b/po/eu.po
index 42830a7a7..f2536b3c2 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,20 +1,20 @@
-# translation of apt-eu.po to Basque
+# translation of eu.po to librezale.org
# This file is put in the public domain.
-# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
-# Piarres Beobide <pi@beobide.net>, 2005.
#
+# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
+# Piarres Beobide <pi@beobide.net>, 2005, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: apt_po_eu\n"
+"Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-11-07 22:37+0100\n"
+"POT-Creation-Date: 2006-01-19 00:08+0100\n"
+"PO-Revision-Date: 2006-01-29 21:15+0100\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale.org <librezale@librezale.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"\n"
@@ -233,8 +233,7 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
+msgstr "Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
#: cmdline/apt-cdrom.cc:93
msgid "Please insert a Disc in the drive and press enter"
@@ -516,7 +515,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-en mugara (%sB) heldu da.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Huts egin du %s(e)tik datuak lortzean"
@@ -1082,10 +1081,9 @@ msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr ""
-"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1114,8 +1112,7 @@ msgstr "Huts egin du zenbat artxibo lortzean."
#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
+msgstr "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
#: cmdline/apt-get.cc:2068
#, c-format
@@ -1138,8 +1135,7 @@ msgstr "Prozesu umeak huts egin du"
#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
+msgstr "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
#: cmdline/apt-get.cc:2149
#, c-format
@@ -1156,8 +1152,7 @@ msgstr "%s: ez du eraikitze-mendekotasunik.\n"
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-msgstr ""
-"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
+msgstr "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
#: cmdline/apt-get.cc:2273
#, c-format
@@ -1360,8 +1355,7 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen"
#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+msgid "above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall "
"berriro"
@@ -1621,8 +1615,7 @@ msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du"
+msgstr "Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du"
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1661,8 +1654,7 @@ msgstr "CD okerra"
#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-"Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
+msgstr "Ezin izan da %s(e)ko CD-ROMa desmuntatu; beharbada erabiltzen ariko da."
#: methods/cdrom.cc:169
msgid "Disk not found."
@@ -1672,12 +1664,12 @@ msgstr "Ez da diska aurkitu"
msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa-ordua ezartzean"
@@ -1763,8 +1755,7 @@ msgstr "Ezin izan da socket-a sortu"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
+msgstr "Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1808,7 +1799,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du"
msgid "Unable to accept connection"
msgstr "Ezin da konexioa onartu"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1858,8 +1849,7 @@ msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
+msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
#: methods/connect.cc:106
#, c-format
@@ -1898,8 +1888,7 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten."
#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
#: methods/gpgv.cc:196
@@ -1941,76 +1930,76 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
msgid "Read error from %s process"
msgstr "Irakurri errorea %s prozesutik"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Goiburuen zain"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Okerreko goiburu-lerroa"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du."
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "http zerbitzariak barruti onarpena apurturik du"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Datu-formatu ezezaguna"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Konexioaren denbora-muga gainditu da"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Barne-errorea"
@@ -2117,8 +2106,7 @@ msgstr "%s aukerak argumentu bat behar du."
#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-"%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
+msgstr "%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
@@ -2169,8 +2157,7 @@ msgstr "Ezin izan da %s blokeo-fitxategia ireki"
#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
+msgstr "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
#: apt-pkg/contrib/fileutl.cc:109
#, c-format
@@ -2384,10 +2371,8 @@ msgstr "'%s' motako indize-fitxategirik ez da onartzen"
#: apt-pkg/algorithms.cc:241
#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
#: apt-pkg/algorithms.cc:1059
msgid ""
@@ -2554,11 +2539,15 @@ msgstr "S/I errorea iturburu-cachea gordetzean"
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2567,7 +2556,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2576,15 +2565,14 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:814
+#: 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 ""
"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
@@ -2685,8 +2673,7 @@ msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
+msgstr "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
#: apt-pkg/deb/dpkgpm.cc:358
#, c-format
@@ -2741,3 +2728,4 @@ msgstr "%s konfigurazioaz kentzen"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Konexioa behar baino lehenago itxi da"
+
diff --git a/po/fi.po b/po/fi.po
index 7ab6eec32..d88927612 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-02-15 14:09+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -521,7 +521,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLinkin yläraja %st saavutettu.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Tiedostolle %s ei toimi stat"
@@ -1090,7 +1090,7 @@ msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
#: cmdline/apt-get.cc:1983
@@ -1676,12 +1676,12 @@ msgstr "Tiedostoa ei löydy"
msgid "File not found"
msgstr "Tiedostoa ei löydy"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -1809,7 +1809,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1941,76 +1941,76 @@ msgstr "Putkea %s ei voitu avata"
msgid "Read error from %s process"
msgstr "Prosessi %s ilmoitti lukuvirheestä"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2553,11 +2553,15 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2566,7 +2570,7 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2575,7 +2579,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2583,7 +2587,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Koko ei täsmää"
diff --git a/po/fr.po b/po/fr.po
index 8159dcbca..cdf36779c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,21 +1,21 @@
# translation of fr.po to French
# Advanced Package Transfer - APT message translation catalog
# French messages
+#
# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006.
-#
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2006-01-06 08:54+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
+"PO-Revision-Date: 2006-01-20 14:17+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.1\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
#: cmdline/apt-cache.cc:135
@@ -235,13 +235,11 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-"Veuillez indiquer le nom de ce disque, par exemple Debian 2.1r1 Disk 1"
+msgstr "Veuillez indiquer le nom de ce disque, par exemple Debian 2.1r1 Disk 1"
#: cmdline/apt-cdrom.cc:93
msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Veuillez insrer un disque dans le lecteur et appuyez sur la touche Entre"
+msgstr "Veuillez insrer un disque dans le lecteur et appuyez sur la touche Entre"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
@@ -317,8 +315,7 @@ msgstr "Impossible d'crire sur %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-"Impossible d'obtenir la version de debconf. Est-ce que debconf est install?"
+msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est install?"
#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
@@ -434,8 +431,7 @@ msgstr "Aucune slection ne correspond"
#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr ""
-"Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s"
+msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s"
#: ftparchive/cachedb.cc:45
#, c-format
@@ -527,7 +523,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Seuil de delink de %so atteint.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Impossible de statuer %s"
@@ -801,8 +797,7 @@ msgstr "Erreur interne, InstallPackages appel avec des paquets casss."
#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"Les paquets doivent tre enlevs mais la dsinstallation est dsactive."
+msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive."
#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
@@ -836,8 +831,7 @@ msgstr "Il est ncessaire de prendre %so dans les archives.\n"
#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr ""
-"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n"
+msgstr "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n"
#: cmdline/apt-get.cc:832
#, c-format
@@ -908,8 +902,7 @@ msgstr ""
#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-"l'option --fix-missing et l'change de support ne sont pas encore reconnus."
+msgstr "l'option --fix-missing et l'change de support ne sont pas encore reconnus."
#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
@@ -971,8 +964,7 @@ msgstr "Aucun paquet ne correspond au paquet %s"
#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n"
+msgstr "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n"
#: cmdline/apt-get.cc:1141
#, c-format
@@ -1026,8 +1018,7 @@ msgstr "Note, slectionne %s pour l'expression rationnelle %s\n"
#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr ""
-"Vous pouvez lancer apt-get -f install pour corriger ces problmes:"
+msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:"
#: cmdline/apt-get.cc:1558
msgid ""
@@ -1107,7 +1098,7 @@ msgstr "Impossible de trouver une source de paquet pour %s"
#: cmdline/apt-get.cc:1959
#, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Saut du tlchargement du fichier %s, dj tlcharg\n"
#: cmdline/apt-get.cc:1983
@@ -1207,8 +1198,7 @@ msgstr "Impossible de satisfaire les dpendances %s pour %s: %s"
#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites."
+msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites."
#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
@@ -1391,8 +1381,7 @@ msgstr ""
"seules les erreurs"
#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+msgid "above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"prcdant ce message sont importantes. Veuillez les corriger et\n"
"dmarrer l'[I]nstallation une nouvelle fois."
@@ -1654,8 +1643,7 @@ msgstr "Ce n'est pas une archive DEB valide, partie %s manquante"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s"
+msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s"
#: apt-inst/deb/debfile.cc:112
#, c-format
@@ -1706,12 +1694,12 @@ msgstr "Disque non trouv."
msgid "File not found"
msgstr "Fichier non trouv"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Impossible de statuer"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Impossible de modifier l'heure "
@@ -1758,8 +1746,7 @@ msgstr ""
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr ""
-"La commande %s du script de connexion a chou, le serveur a rpondu: %s"
+msgstr "La commande %s du script de connexion a chou, le serveur a rpondu: %s"
#: methods/ftp.cc:291
#, c-format
@@ -1796,8 +1783,7 @@ msgstr "Impossible de crer un connecteur"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Impossible de se connecter sur le port de donnes, dlai de connexion dpass"
+msgstr "Impossible de se connecter sur le port de donnes, dlai de connexion dpass"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1841,7 +1827,7 @@ msgstr "Dlai de connexion au port de donnes dpass"
msgid "Unable to accept connection"
msgstr "Impossible d'accepter une connexion"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problme de hachage du fichier"
@@ -1929,12 +1915,10 @@ msgstr "Impossible de se connecter %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr "E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon."
#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erreur interne: signature correcte, mais il est impossible de dterminer "
"l'empreinte de la cl."
@@ -1978,76 +1962,76 @@ msgstr "Ne parvient pas ouvrir le tube pour %s"
msgid "Read error from %s process"
msgstr "Erreur de lecture du processus %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Attente des fichiers d'en-tte"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "J'ai une simple ligne d'en-tte au-dessus du caractre %u"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Mauvaise ligne d'en-tte"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Le serveur http a envoy une rponse dont l'en-tte est invalide"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Le serveur http a envoy un en-tte Content-Length invalide"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Le serveur http a envoy un en-tte Content-Range invalide"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ce serveur http possde un support des limites non-valide"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Slection dfaillante"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Dlai de connexion dpass"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erreur d'criture du fichier de sortie"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erreur d'criture sur un fichier"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erreur d'criture sur le fichier"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Mauvais en-tte de donne"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "chec de la connexion"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Erreur interne"
@@ -2368,14 +2352,12 @@ msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de l'URI)"
#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Ligne %lu mal forme dans la liste des sources %s (distribution absolue)"
+msgstr "Ligne %lu mal forme dans la liste des sources %s (distribution absolue)"
#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)"
+msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)"
#: apt-pkg/sourcelist.cc:203
#, c-format
@@ -2395,14 +2377,12 @@ msgstr "Ligne %u mal forme dans la liste des sources %s (type)"
#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-"Le type %s est inconnu sur la ligne %u dans la liste des sources %s"
+msgstr "Le type %s est inconnu sur la ligne %u dans la liste des sources %s"
#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
-"Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)"
+msgstr "Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)"
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2423,8 +2403,7 @@ msgstr "Le type de fichier d'index %s n'est pas accept"
#: apt-pkg/algorithms.cc:241
#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Le paquet %s doit tre rinstall, mais je ne parviens pas trouver son "
"archive."
@@ -2491,8 +2470,7 @@ msgstr "Impossible de localiser %s."
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Vous devez insrer quelques adresses sources dans votre sources.list"
+msgstr "Vous devez insrer quelques adresses sources dans votre sources.list"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
@@ -2566,8 +2544,7 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Vous avez dpass le nombre de versions que cet APT est capable de traiter."
+msgstr "Vous avez dpass le nombre de versions que cet APT est capable de traiter."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2603,19 +2580,22 @@ msgstr "Assemblage des fichiers lists dans les champs Provides"
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
-msgstr ""
-"Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources"
+msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Somme de contrle MD5 incohrente"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Aucune cl publique n'est disponible pour la/les cl(s) suivante(s):\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2625,7 +2605,7 @@ msgstr ""
"sans doute que vous devrez corriger ce paquet manuellement (absence "
"d'architecture)."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2634,15 +2614,14 @@ msgstr ""
"Je ne suis pas parvenu localiser un fichier du paquet %s. Ceci signifie "
"que vous devrez corriger manuellement ce paquet."
-#: apt-pkg/acquire-item.cc:814
+#: 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 ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Taille incohrente"
@@ -2800,3 +2779,4 @@ msgstr "%s purg"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connexion ferme prmaturment"
+
diff --git a/po/gl.po b/po/gl.po
index 55b9f7d4b..4e32525ea 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-11-09 01:49+0100\n"
+"POT-Creation-Date: 2006-01-20 14:06+0100\n"
+"PO-Revision-Date: 2006-01-21 13:33+0100\n"
"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
"MIME-Version: 1.0\n"
@@ -523,7 +523,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Alcanzouse o límite de desligado de %sB.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Non se atopou %s"
@@ -1090,9 +1090,9 @@ msgid "Unable to find a source package for %s"
msgstr "Non se puido atopar un paquete fonte para %s"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1680,12 +1680,12 @@ msgstr "Non se atopou o disco"
msgid "File not found"
msgstr "Non se atopou o ficheiro"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Non se atopou"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Non se puido estabrecer a hora de modificación"
@@ -1814,7 +1814,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
msgid "Unable to accept connection"
msgstr "Non se pode aceptar a conexión"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
@@ -1949,76 +1949,76 @@ msgstr "Non se puido abrir unha canle para %s"
msgid "Read error from %s process"
msgstr "Erro de lectura do proceso %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "A agardar polas cabeceiras"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Liña de cabeceira incorrecta"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP ten un soporte de rangos roto"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de data descoñecido"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Fallou a chamada a select"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "A conexión esgotou o tempo"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erro ao escribir no ficheiro de saída"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erro ao escribir nun ficheiro"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erro ao escribir no ficheiro"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Datos da cabeceira incorrectos"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "A conexión fallou"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Erro interno"
@@ -2562,11 +2562,16 @@ msgstr "Erro de E/S ao gravar a caché de fontes"
msgid "rename failed, %s (%s -> %s)."
msgstr "fallou o cambio de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Os MD5Sum non coinciden"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2575,7 +2580,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falla a arquitectura)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2584,7 +2589,7 @@ msgstr ""
"Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2592,7 +2597,7 @@ msgstr ""
"Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
@@ -2751,3 +2756,4 @@ msgstr "Eliminouse con config %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "A conexión pechouse prematuramente"
+
diff --git a/po/hu.po b/po/hu.po
index cfe59f829..c02a0a4fa 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-02-15 18:03+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -522,7 +522,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink elérte %sB korlátját.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "%s elérése sikertelen"
@@ -1093,7 +1093,7 @@ msgstr "Nem található forráscsomag ehhez: %s"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
#: cmdline/apt-get.cc:1983
@@ -1682,12 +1682,12 @@ msgstr "Nem találom a fájlt"
msgid "File not found"
msgstr "Nem találom a fájlt"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Nem érhető el"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Nem sikerült beállítani a módosítási időt"
@@ -1816,7 +1816,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1948,76 +1948,76 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
msgid "Read error from %s process"
msgstr "Olvasási hiba a(z) %s folyamattól"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Rossz fejléc sor"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ez a http szerver támogatja a sérült tartományokat "
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Kapcsolódás sikertelen"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Belső hiba"
@@ -2569,11 +2569,15 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor"
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2582,7 +2586,7 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2591,14 +2595,14 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
diff --git a/po/it.po b/po/it.po
index e7aa6ec0a..086e2ab53 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2006-01-01 18:02+0100\n"
+"POT-Creation-Date: 2006-01-20 14:06+0100\n"
+"PO-Revision-Date: 2006-02-14 11:41+0100\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
@@ -84,11 +84,11 @@ msgstr "Totale spazio occupato: "
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
-msgstr "Il file dei pacchetti %s desincronizzato."
+msgstr "Il file dei pacchetti %s non sincronizzato."
#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
-msgstr "Bisogna dare solamente un pattern"
+msgstr "Bisogna specificare un singolo pattern"
#: cmdline/apt-cache.cc:1385
msgid "No packages found"
@@ -101,7 +101,7 @@ msgstr "File dei pacchetti:"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-"La cache desincronizzata, impossibile referenziare un file di pacchetti"
+"La cache non sincronizzata, impossibile referenziare un file di pacchetti"
#: cmdline/apt-cache.cc:1470
#, c-format
@@ -385,7 +385,7 @@ msgstr ""
" clean config\n"
"\n"
"apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n"
-"molti stili di generazione da completamente automatici a alternative "
+"molti stili di generazione da completamente automatici a alternative\n"
"funzionali per dpkg-scanpackages e dpkg-scansources\n"
"\n"
"apt-ftparchive genera file Packages da un albero di .deb. Il\n"
@@ -394,12 +394,12 @@ msgstr ""
" supportato per forzare il valore di Priorit e Sezione.\n"
"\n"
"Similarmente apt-ftparchive genera file Sources da un albero di .dscs.\n"
-"L'opzione --source-override pu essere usata per specificare un file di "
-"override per i sorgenti\n"
+"L'opzione --source-override pu essere usata per specificare un file\n"
+"di override per i sorgenti\n"
"\n"
-"I comandi 'packages' e 'sources' devono essere seguiti nella root \n"
+"I comandi 'packages' e 'sources' devono essere eseguiti nella root \n"
"dell'albero. BinaryPath deve puntare alla base della ricerca \n"
-"ricorsiva e il file override devecontenere le opzioni di override. "
+"ricorsiva e il file override deve contenere le opzioni di override.\n"
"Pathprefix \n"
" aggiunto al campo filename se presente. Esempio di utilizzo \n"
"dall'archivio debian:\n"
@@ -448,7 +448,7 @@ msgstr "La data del file cambiata %s"
#: ftparchive/cachedb.cc:155
msgid "Archive has no control record"
-msgstr "L'Archivio non ha un campo control"
+msgstr "L'archivio non ha un campo control"
#: ftparchive/cachedb.cc:267
msgid "Unable to get a cursor"
@@ -516,7 +516,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limite di %sB raggiunto.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Impossibile analizzare %s"
@@ -593,12 +593,12 @@ msgstr "Impossibile eseguire fork"
#: ftparchive/multicompress.cc:215
msgid "Compress child"
-msgstr "Figlio compresso"
+msgstr "Sottoprocesso compresso"
#: ftparchive/multicompress.cc:238
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "Errore interno, Impossibile creare %s"
+msgstr "Errore interno, impossibile creare %s"
#: ftparchive/multicompress.cc:289
msgid "Failed to create subprocess IPC"
@@ -942,10 +942,9 @@ msgid ""
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"Il pacchetto %s non ha versioni disponibili, ma ma nominato da un "
-"altropacchetto.\n"
-" Questo significa che il pacchetto manca, diventato obsoletoo "
-"disponibile solo all'interno di un'altra sorgente\n"
+"Il pacchetto %s non ha versioni disponibili, ma nominato da un altro\n"
+"pacchetto. Questo significa che il pacchetto manca, diventato obsoleto\n"
+"o disponibile solo all'interno di un'altra sorgente\n"
#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
@@ -959,7 +958,7 @@ msgstr "Il pacchetto %s non ha candidati da installare"
#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La reinstallazione di %s non possibile, non pu esssere scaricato.\n"
+msgstr "La reinstallazione di %s non possibile, non pu essere scaricato.\n"
#: cmdline/apt-get.cc:1141
#, c-format
@@ -1042,7 +1041,7 @@ msgid ""
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"Poich stata richiesta solo una singola operazione molto facile che\n"
+"Poich stata richiesta solo una singola operazione molto facile che\n"
"il pacchetto semplicemente non sia installabile, si consiglia\n"
"di inviare un \"bug report\" per tale pacchetto."
@@ -1084,7 +1083,7 @@ msgstr "Errore interno, problem resolver ha rotto qualcosa"
#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
-msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente"
+msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente"
#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
@@ -1092,9 +1091,9 @@ msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n"
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Si saltato il file gi scaricato '%s'\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1689,12 +1688,12 @@ msgstr "Disco non trovato"
msgid "File not found"
msgstr "File non trovato"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Impossibile analizzare"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Impossibile impostare la data di modifica (modification time)"
@@ -1823,7 +1822,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati"
msgid "Unable to accept connection"
msgstr "Impossibile accettare connessioni"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemi nella creazione dell'hash del file"
@@ -1959,77 +1958,77 @@ msgstr "Impossibile aprire una pipe per %s"
msgid "Read error from %s process"
msgstr "Errore di lettura dal processo %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Si ottenuto una singola linea di header su %u caratteri"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linea nell'header non corretta"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Il server HTTP ha inviato un Content-Length non valido"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Il server HTTP ha inviato un Content-Range non valido"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Questo server HTTP ha il supporto del range bacato"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select fallito"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tempo limite per la connessione esaurito"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Errore nella scrittura del file di output"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Errore nella lettura dal server"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Header dei dati malformato"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Connessione fallita"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Errore interno"
@@ -2584,11 +2583,16 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() fallita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2598,7 +2602,7 @@ msgstr ""
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2607,7 +2611,7 @@ msgstr ""
"Non stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2615,7 +2619,7 @@ msgstr ""
"I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
@@ -2771,259 +2775,3 @@ msgstr "Rimosso con la configurazione %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connessione chiusa prematuramente"
-
-#~ msgid "Write Error"
-#~ msgstr "Errore di Scrittura"
-
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "ID vendor '%s', alla linea %u della lista sorgente %s, sconosciuto"
-
-#~ msgid "File Not Found"
-#~ msgstr "File Non Trovato"
-
-#~ msgid ""
-#~ "Some broken packages were found while trying to process build-"
-#~ "dependencies.\n"
-#~ "You might want to run `apt-get -f install' to correct these."
-#~ msgstr ""
-#~ "Sono stati trovati dei pacchetti con errori mentre si cercava di "
-#~ "cotruire\n"
-#~ "le dipendenze. Si consiglia di eseguire `apt-get -f install` per "
-#~ "correggerli."
-
-#~ msgid "<- '"
-#~ msgstr "<- '"
-
-#~ msgid "'"
-#~ msgstr "'"
-
-#~ msgid "-> '"
-#~ msgstr "-> '"
-
-#~ msgid "Followed conf file from "
-#~ msgstr "Si Ú seguito il file di configurazione da "
-
-#~ msgid " to "
-#~ msgstr " a "
-
-#~ msgid "Extract "
-#~ msgstr "Estratto "
-
-#~ msgid "Aborted, backing out"
-#~ msgstr "Abortito, ripristino in corso"
-
-#~ msgid "De-replaced "
-#~ msgstr "Non sostituito"
-
-#~ msgid " from "
-#~ msgstr " da "
-
-#~ msgid "Backing out "
-#~ msgstr "Ripristino in corso "
-
-#~ msgid " [new node]"
-#~ msgstr " [nuovo nodo]"
-
-#~ msgid "Replaced file "
-#~ msgstr "File sostituito "
-
-#~ msgid "Internal Error, Unable to parse a package record"
-#~ msgstr "Errore interno, Impossibile analizzare un campo del pacchetto"
-
-#~ msgid "Unimplemented"
-#~ msgstr "Non Implementato"
-
-#~ msgid "You must give at least one file name"
-#~ msgstr "Bisogna dare almeno un nome di un file"
-
-#~ msgid "Generating cache"
-#~ msgstr "Generazione cache in corso"
-
-#~ msgid "Problem with SelectFile"
-#~ msgstr "Problemi con SelectFile"
-
-#~ msgid "Problem with MergeList"
-#~ msgstr "Problemi con MergeList"
-
-#~ msgid "Regex compilation error"
-#~ msgstr "Errore nella compilazione della regex"
-
-#~ msgid "Write to stdout failed"
-#~ msgstr "Scrittura su stdout fallita"
-
-#~ msgid "Generate must be enabled for this function"
-#~ msgstr "Generate deve essere abilitata per questa funzione"
-
-#~ msgid "Failed to stat %s%s"
-#~ msgstr "Impossibile analizzare %s%s"
-
-#~ msgid "Failed to open %s.new"
-#~ msgstr "Impossibile aprire %s.new"
-
-#~ msgid "Failed to rename %s.new to %s"
-#~ msgstr "Impossibile rinominare %s.new in %s"
-
-#~ msgid "I found (binary):"
-#~ msgstr "Trovati (binary):"
-
-#~ msgid "I found (source):"
-#~ msgstr "Trovati (source):"
-
-#~ msgid "Found "
-#~ msgstr "Trovato "
-
-#~ msgid " source indexes."
-#~ msgstr " sorgenti indicizzati."
-
-#~ msgid ""
-#~ "Unable to locate any package files, perhaps this is not a Debian Disc"
-#~ msgstr ""
-#~ "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian"
-
-#~ msgid " '"
-#~ msgstr " '"
-
-#~ msgid ""
-#~ "Usage: apt-cdrom [options] command\n"
-#~ "\n"
-#~ "apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-#~ "CDROM mount point and device information is taken from apt.conf\n"
-#~ "and /etc/fstab.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ " add - Add a CDROM\n"
-#~ " ident - Report the identity of a CDROM\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " -h This help text\n"
-#~ " -d CD-ROM mount point\n"
-#~ " -r Rename a recognized CD-ROM\n"
-#~ " -m No mounting\n"
-#~ " -f Fast mode, don't check package files\n"
-#~ " -a Thorough scan mode\n"
-#~ " -c=? Read this configuration file\n"
-#~ " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See fstab(5)\n"
-#~ msgstr ""
-#~ "Utilizzo: apt-cdrom [opzioni] comando\n"
-#~ "\n"
-#~ "apt-cdrom Ú un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\n"
-#~ "mount point del CDROM e l'informazione della periferica sono presi da apt."
-#~ "conf\n"
-#~ "e /etc/fstab.\n"
-#~ "\n"
-#~ "Comandi:\n"
-#~ " add - Aggiunge un CDROM\n"
-#~ " ident - riporta l'identità di un CDROM\n"
-#~ "\n"
-#~ "Opzioni:\n"
-#~ " -h Questo help\n"
-#~ " -d Mount point del CDROM\n"
-#~ " -r Rinomina un CDROM riconosciuto\n"
-#~ " -m Nessun montaggio\n"
-#~ " -f Modalità veloce, non controlla i file dei "
-#~ "pacchetti\n"
-#~ " -a Scansione in modalità accurata\n"
-#~ " -c=? Legge come configurazione il file specificato\n"
-#~ " -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n"
-#~ "Vedere fstab(5)\n"
-
-#~ msgid "Internal Error, non-zero counts"
-#~ msgstr "Errore interno, contatori non a zero"
-
-#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
-#~ msgstr ""
-#~ "Spiacente, spazio su disco insufficente in %s per tenere tutti i "
-#~ "pacchetti."
-
-#~ msgid "Couldn't wait for subprocess"
-#~ msgstr "Impossibile attendere il sottoprocesso"
-
-#~ msgid "....\"Have you mooed today?\"..."
-#~ msgstr "....\"Hai muggito oggi?\"..."
-
-#~ msgid " New "
-#~ msgstr " Nuovo "
-
-#~ msgid "B "
-#~ msgstr "B "
-
-#~ msgid " files "
-#~ msgstr " file "
-
-#~ msgid " pkgs in "
-#~ msgstr " pacchetti in "
-
-#~ msgid ""
-#~ "Usage: apt-ftparchive [options] command\n"
-#~ "Commands: packges binarypath [overridefile [pathprefix]]\n"
-#~ " sources srcpath [overridefile [pathprefix]]\n"
-#~ " contents path\n"
-#~ " generate config [groups]\n"
-#~ " clean config\n"
-#~ msgstr ""
-#~ "Utilizzo: apt-ftparchive [opzioni] comando\n"
-#~ "Comandi: packges binarypath [overridefile [pathprefix]]\n"
-#~ " sources srcpath [overridefile [pathprefix]]\n"
-#~ " contents path\n"
-#~ " generate config [groups]\n"
-#~ " clean config\n"
-
-#~ msgid ""
-#~ "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\n"
-#~ msgstr ""
-#~ "Opzioni:\n"
-#~ " -h Questo help\n"
-#~ " -md5 Generazione MD5 di controllo\n"
-#~ " -s=? file override per i sorgenti.\n"
-#~ " -q silenzioso\n"
-#~ " -d=? Seleziona il database opzionale per la cache\n"
-#~ " -no-delink Abilita la modalità di debug per il delink\n"
-#~ " -contents Generazione file contents di controllo\n"
-#~ " -c=? Legge come configurazione il file specificato\n"
-#~ " -o=? Imposta un'opzione di configurazione\n"
-
-#~ msgid "Done Packages, Starting contents."
-#~ msgstr "Packages terminato, Inizio i contents."
-
-#~ msgid "Hit contents update byte limit"
-#~ msgstr "Limite di byte per l'aggiornamento dei contents processati"
-
-#~ msgid "Done. "
-#~ msgstr "Fatto. "
-
-#~ msgid "B in "
-#~ msgstr "B in "
-
-#~ msgid " archives. Took "
-#~ msgstr " archivi. Sono occorsi"
-
-#~ msgid "B hit."
-#~ msgstr "B hit."
-
-#~ msgid " not "
-#~ msgstr " non "
-
-#~ msgid "DSC file '%s' is too large!"
-#~ msgstr "il file DSC '%s' Ú troppo largo!"
-
-#~ msgid "Could not find a record in the DSC '%s'"
-#~ msgstr "Impossibile trovare un campo nel DSC '%s'"
-
-#~ msgid "Error parsing file record"
-#~ msgstr "Errore nell'analisi del campo file"
-
-#~ msgid "Failed too stat %s"
-#~ msgstr "Impossibile anche analizzare %s"
-
-#~ msgid "Errors apply to file '%s'"
-#~ msgstr "Gli errori si applicano al file `%s'"
diff --git a/po/ja.po b/po/ja.po
index 445e575c1..d29825fbb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,102 +8,102 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-02-09 12:54+0900\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
+"PO-Revision-Date: 2006-01-25 20:55+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8 bit\n"
#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "ѥå %s ΥС %s ˤϲԲǽʰ¸طޤ:\n"
+msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n"
#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
-msgstr "ѥå %s 򸫤Ĥ뤳ȤǤޤ"
+msgstr "パッケージ %s が見つかりません"
#: cmdline/apt-cache.cc:232
msgid "Total package names : "
-msgstr "ѥå̾: "
+msgstr "パッケージ名総数: "
#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
-msgstr " ̾ѥå: "
+msgstr " 通常パッケージ: "
#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
-msgstr " 貾ۥѥå: "
+msgstr " 純粋仮想パッケージ: "
#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
-msgstr " ñ첾ۥѥå: "
+msgstr " 単一仮想パッケージ: "
#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
-msgstr " ʣ精ۥѥå: "
+msgstr " 複合仮想パッケージ: "
#: cmdline/apt-cache.cc:276
msgid " Missing: "
-msgstr " : "
+msgstr " 欠落: "
#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
-msgstr "̥С: "
+msgstr "個別バージョン総数: "
#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
-msgstr "¸ط: "
+msgstr "依存関係総数: "
#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
-msgstr "С/եط: "
+msgstr "バージョン/ファイル関係総数: "
#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
-msgstr "󶡥ޥåԥ: "
+msgstr "提供マッピング総数: "
#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
-msgstr "Glob ʸ: "
+msgstr "Glob 文字列の総数: "
#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
-msgstr "¸طС: "
+msgstr "総依存関係・バージョン容量: "
#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
-msgstr ": "
+msgstr "総空き容量: "
#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
-msgstr "ͭ: "
+msgstr "総占有容量: "
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
-msgstr "Package ե %s ƱƤޤ"
+msgstr "Package ファイル %s が同期していません。"
#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
-msgstr "ѥϤ礦 1 ĤꤷƤ"
+msgstr "パターンはちょうど 1 つだけ指定してください"
#: cmdline/apt-cache.cc:1385
msgid "No packages found"
-msgstr "ѥåĤޤ"
+msgstr "パッケージが見つかりません"
#: cmdline/apt-cache.cc:1462
msgid "Package files:"
-msgstr "ѥåե:"
+msgstr "パッケージファイル:"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "å夬ƱƤ餺ѥåե߻ȤǤޤ"
+msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません"
#: cmdline/apt-cache.cc:1470
#, c-format
@@ -113,34 +113,34 @@ msgstr "%4i %s\n"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
-msgstr "Pin ѥå:"
+msgstr "Pin パッケージ:"
#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
-msgstr "(Ĥޤ)"
+msgstr "(見つかりません)"
#. Installed version
#: cmdline/apt-cache.cc:1515
msgid " Installed: "
-msgstr " 󥹥ȡ뤵ƤС: "
+msgstr " インストールされているバージョン: "
#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
-msgstr "(ʤ)"
+msgstr "(なし)"
#. Candidate Version
#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
-msgstr " : "
+msgstr " 候補: "
#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
-msgstr " ѥå Pin: "
+msgstr " パッケージ Pin: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1541
msgid " Version table:"
-msgstr " Сơ֥:"
+msgstr " バージョンテーブル:"
#: cmdline/apt-cache.cc:1556
#, c-format
@@ -152,7 +152,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s for %s %s ѥ: %s %s\n"
+msgstr "%s %s for %s %s コンパイル日時: %s %s\n"
#: cmdline/apt-cache.cc:1658
msgid ""
@@ -192,61 +192,57 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-"ˡ: apt-cache [ץ] ޥ\n"
-" apt-cache [ץ] add file1 [file2 ...]\n"
-" apt-cache [ץ] showpkg pkg1 [pkg2 ...]\n"
-" apt-cache [ץ] showsrc pkg1 [pkg2 ...]\n"
+"使用方法: apt-cache [オプション] コマンド\n"
+" apt-cache [オプション] add file1 [file2 ...]\n"
+" apt-cache [オプション] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [オプション] showsrc pkg1 [pkg2 ...]\n"
"\n"
-"apt-cache APT ΥХʥꥭåեꡢ\n"
-"򸡺ꤹ뤿٥ΥġǤ\n"
+"apt-cache は APT のバイナリキャッシュファイルを操作したり、そこから情\n"
+"報を検索したりするための低レベルのツールです\n"
"\n"
-"ޥ:\n"
-" add - ѥåե򥽡åɲä\n"
-" gencaches - ѥåӥå\n"
-" showpkg - ñѥåΰ̾ɽ\n"
-" showsrc - 쥳ɤɽ\n"
-" stats - ܥơɽ\n"
-" dump - ƤΥեñʷɽ\n"
-" dumpavail - available եɸϤ˽Ϥ\n"
-" unmet - ̤ΰ¸طɽ\n"
-" search - ɽѥˤäƥѥå򸡺\n"
-" show - ѥåξɽ\n"
-" depends - ѥå¸Ƥѥåɽ\n"
-" rdepends - ѥåεհ¸ɽ\n"
-" pkgnames - ƤΥѥå̾ɽ\n"
-" dotty - GraphVis ѤΥѥåդ\n"
-" xvcg - xvcg ѤΥѥåդ\n"
-" policy - ݥꥷɽ\n"
+"コマンド:\n"
+" add - パッケージファイルをソースキャッシュに追加する\n"
+" gencaches - パッケージおよびソースキャッシュを生成する\n"
+" showpkg - 単一パッケージの一般情報を表示する\n"
+" showsrc - ソースレコードを表示する\n"
+" stats - 基本ステータス情報を表示する\n"
+" dump - すべてのファイルを簡単な形式で表示する\n"
+" dumpavail - available ファイルを標準出力に出力する\n"
+" unmet - 未解決の依存関係を表示する\n"
+" search - 正規表現パターンによってパッケージを検索する\n"
+" show - パッケージの情報を表示する\n"
+" depends - パッケージが依存しているパッケージを表示する\n"
+" rdepends - パッケージの逆依存情報を表示する\n"
+" pkgnames - すべてのパッケージ名を表示する\n"
+" dotty - GraphVis 用のパッケージグラフを生成する\n"
+" xvcg - xvcg 用のパッケージグラフを生成する\n"
+" policy - ポリシー設定情報を表示する\n"
"\n"
-"ץ:\n"
-" -h Υإפɽ\n"
-" -p=? ѥåå\n"
-" -s=? å\n"
-" -q ץ쥹ɽ򤷤ʤ\n"
-" -i umnet ޥɤǽפʰ¸Τߤɽ\n"
-" -c=? ꤷեɤ߹\n"
-" -o=? ꤷꥪץɤ߹ (: -o dir::cache=/tmp)\n"
-"ܺ٤ϡapt-cache(8) apt.conf(5) Υޥ˥奢ڡ򻲾ȤƤ\n"
+"オプション:\n"
+" -h このヘルプを表示する\n"
+" -p=? パッケージキャッシュ\n"
+" -s=? ソースキャッシュ\n"
+" -q プログレス表示をしない\n"
+" -i umnet コマンドで重要な依存情報のみを表示する\n"
+" -c=? 指定した設定ファイルを読み込む\n"
+" -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n"
+"詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n"
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "このディスクに、'Debian 2.1r1 Disk 1' のような名前を付けてください"
#: cmdline/apt-cdrom.cc:93
-#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"ǥѹ: \n"
-" '%s'\n"
-"ȥ٥դǥɥ饤 '%s' enter 򲡤Ƥ\n"
+msgstr "ディスクをドライブに入れて enter を押してください"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "あなたの持っている CD セットの残り全部に、この手順を繰り返してください。"
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
-msgstr "ڥǤϤޤ"
+msgstr "引数がペアではありません"
#: cmdline/apt-config.cc:76
msgid ""
@@ -263,23 +259,23 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"ˡ: apt-config [ץ] ޥ\n"
+"使用方法: apt-config [オプション] コマンド\n"
"\n"
-"apt-config APT եɤ߹िδñʥġǤ\n"
+"apt-config は APT の設定ファイルを読み込むための簡単なツールです\n"
"\n"
-"ޥ:\n"
-" shell - ⡼\n"
-" dump - ɽ\n"
+"コマンド:\n"
+" shell - シェルモード\n"
+" dump - 設定情報を表示する\n"
"\n"
-"ץ:\n"
-" -h Υإפɽ\n"
-" -c=? ꤷեɤߤ\n"
-" -o=? ꤷꥪץŬѤ(: -o dir::cache=/tmp)\n"
+"オプション:\n"
+" -h このヘルプを表示する\n"
+" -c=? 指定した設定ファイルを読み込む\n"
+" -o=? 指定した設定オプションを適用する(例: -o dir::cache=/tmp)\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
msgid "%s not a valid DEB package."
-msgstr "%s DEB ѥåǤϤޤ"
+msgstr "%s は正しい DEB パッケージではありません。"
#: cmdline/apt-extracttemplates.cc:232
msgid ""
@@ -294,53 +290,52 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"ˡ: apt-extracttemplates ե̾1 [ե̾2 ...]\n"
+"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n"
"\n"
-"apt-extracttemplates debian ѥåȥƥץ졼Ⱦ\n"
-"Ф뤿ΥġǤ\n"
+"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n"
+"抽出するためのツールです\n"
"\n"
-"ץ:\n"
-" -h Υإפɽ\n"
-" -t ǥ쥯ȥꤹ\n"
-" -c=? ꤷեɤߤ\n"
-" -o=? ꤷꥪץŬѤ(: -o dir::cache=/tmp)\n"
+"オプション:\n"
+" -h このヘルプを表示する\n"
+" -t 一時ディレクトリを指定する\n"
+" -c=? 指定した設定ファイルを読み込む\n"
+" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
-msgstr "%s ˽񤭹ޤ"
+msgstr "%s に書き込めません"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
-"debconf ΥСǤޤdebconf ϥ󥹥ȡ뤵Ƥޤ?"
+"debconf のバージョンを取得できません。debconf はインストールされていますか?"
#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
-msgstr "ѥåĥҥꥹȤĹ᤮ޤ"
+msgstr "パッケージ拡張子リストが長すぎます"
#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
#, c-format
msgid "Error processing directory %s"
-msgstr "ǥ쥯ȥ %s ν˥顼ȯޤ"
+msgstr "ディレクトリ %s の処理中にエラーが発生しました"
#: ftparchive/apt-ftparchive.cc:254
msgid "Source extension list is too long"
-msgstr "ĥҥꥹȤĹ᤮ޤ"
+msgstr "ソース拡張子リストが長すぎます"
#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
-msgstr "Contents եؤΥإåν񤭹˥顼ȯޤ"
+msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
msgid "Error processing contents %s"
-msgstr "Contents %s ν˥顼ȯޤ"
+msgstr "Contents %s の処理中にエラーが発生しました"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -381,258 +376,258 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
-"ˡ: apt-ftparchive [ץ] ޥ\n"
-"ޥ: packages binarypath [overridefile [pathprefix]]\n"
+"使用方法: apt-ftparchive [オプション] コマンド\n"
+"コマンド: 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 Debian ѤΥǥåե\n"
-"ưΤΤ顢dpkg-scanpackages dpkg-scansources صǽ\n"
-"ȤʤΤޤǡ¿ˡ򥵥ݡȤƤޤ\n"
+"apt-ftparchive は Debian アーカイブ用のインデックスファイルを生成しま\n"
+"す。全自動のものから、dpkg-scanpackages と dpkg-scansources の代替機能\n"
+"となるものまで、多くの生成方法をサポートしています。\n"
"\n"
-"apt-ftparchive .deb Υĥ꡼ Packages եޤ\n"
-"Packages ե MD5 ϥåե륵˲äơƥѥå\n"
-"Τ٤ƤեɤƤޤǤޤPriority Section \n"
-"뤿 override ե뤬ݡȤƤޤ\n"
+"apt-ftparchive は .deb のツリーから Packages ファイルを生成します。\n"
+"Packages ファイルは MD5 ハッシュやファイルサイズに加えて、各パッケージ\n"
+"のすべての制御フィールドの内容を含んでいます。Priority と Section の値\n"
+"を強制するために override ファイルがサポートされています。\n"
"\n"
-"Ʊͤ apt-ftparchive .dsc Υĥ꡼ Sources ե\n"
-"--source-override ץѤȥ override ե\n"
-"Ǥޤ\n"
+"同様に apt-ftparchive は .dsc のツリーから Sources ファイルを生成しま\n"
+"す。--source-override オプションを使用するとソース override ファイルを\n"
+"指定できます。\n"
"\n"
-"'packages' 'sources' ޥɤϥĥ꡼Υ롼ȤǼ¹Ԥɬפ\n"
-"ޤBinaryPath ˤϺƵΥ١ǥ쥯ȥꤷoverride \n"
-"ե override ե饰ޤǤɬפޤ⤷ pathprefix \n"
-"¸ߤХե̾եɤղäޤdebian ֤Ǥ\n"
-"ˡ:\n"
+"'packages' および 'sources' コマンドはツリーのルートで実行する必要があ\n"
+"ります。BinaryPath には再帰検索のベースディレクトリを指定し、override \n"
+"ファイルは override フラグを含んでいる必要があります。もし pathprefix \n"
+"が存在すればファイル名フィールドに付加されます。debian アーカイブでの\n"
+"使用方法の例:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
"\n"
-"ץ:\n"
-" -h Υإפɽ\n"
-" --md5 MD5 椹\n"
-" -s=? override ե\n"
-" -q ɽ\n"
-" -d=? ץΥåǡ١򤹤\n"
-" --no-delink delinking ǥХå⡼ɤͭˤ\n"
-" --contents contents ե椹\n"
-" -c=? եɤ\n"
-" -o=? Ǥդꥪץꤹ"
+"オプション:\n"
+" -h このヘルプを表示する\n"
+" --md5 MD5 の生成を制御する\n"
+" -s=? ソース override ファイル\n"
+" -q 表示を抑制する\n"
+" -d=? オプションのキャッシュデータベースを選択する\n"
+" --no-delink delinking デバッグモードを有効にする\n"
+" --contents contents ファイルの生成を制御する\n"
+" -c=? 指定の設定ファイルを読む\n"
+" -o=? 任意の設定オプションを設定する"
#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
-msgstr "˥ޥåΤޤ"
+msgstr "選択にマッチするものがありません"
#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr "ѥåե륰롼 `%s' ˸ʤե뤬ޤ"
+msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります"
#: ftparchive/cachedb.cc:45
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB Ƥᡢե̾ %s.old ѹޤ"
+msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました"
#: ftparchive/cachedb.cc:63
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "DB Ťᡢ%s Υåץ졼ɤߤޤ"
+msgstr "DB が古いため、%s のアップグレードを試みます"
#: ftparchive/cachedb.cc:73
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "DB ե %s 򳫤ȤǤޤ: %s"
+msgstr "DB ファイル %s を開くことができません: %s"
#: ftparchive/cachedb.cc:114
#, c-format
msgid "File date has changed %s"
-msgstr "ե %s դѹƤޤ"
+msgstr "ファイル %s の日付が変更されています"
#: ftparchive/cachedb.cc:155
msgid "Archive has no control record"
-msgstr "֤쥳ɤޤ"
+msgstr "アーカイブにコントロールレコードがありません"
#: ftparchive/cachedb.cc:267
msgid "Unable to get a cursor"
-msgstr "Ǥޤ"
+msgstr "カーソルを取得できません"
#: ftparchive/writer.cc:78
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr "ٹ: ǥ쥯ȥ %s ɤޤ\n"
+msgstr "警告: ディレクトリ %s が読めません\n"
#: ftparchive/writer.cc:83
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "ٹ: %s stat Ǥޤ\n"
+msgstr "警告: %s の状態を取得できません\n"
#: ftparchive/writer.cc:125
msgid "E: "
-msgstr "顼: "
+msgstr "エラー: "
#: ftparchive/writer.cc:127
msgid "W: "
-msgstr "ٹ: "
+msgstr "警告: "
#: ftparchive/writer.cc:134
msgid "E: Errors apply to file "
-msgstr "顼: 顼ŬѤե "
+msgstr "エラー: エラーが適用されるファイルは "
#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
#, c-format
msgid "Failed to resolve %s"
-msgstr "%s β˼Ԥޤ"
+msgstr "%s の解決に失敗しました"
#: ftparchive/writer.cc:163
msgid "Tree walking failed"
-msgstr "ĥ꡼Ǥΰư˼Ԥޤ"
+msgstr "ツリー内での移動に失敗しました"
#: ftparchive/writer.cc:188
#, c-format
msgid "Failed to open %s"
-msgstr "%s Υץ˼Ԥޤ"
+msgstr "%s のオープンに失敗しました"
#: ftparchive/writer.cc:245
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr " %s [%s] 򳰤ޤ\n"
+msgstr " リンク %s [%s] を外します\n"
#: ftparchive/writer.cc:253
#, c-format
msgid "Failed to readlink %s"
-msgstr "%s readlink ˼Ԥޤ"
+msgstr "%s のリンク読み取りに失敗しました"
#: ftparchive/writer.cc:257
#, c-format
msgid "Failed to unlink %s"
-msgstr "%s unlink ˼Ԥޤ"
+msgstr "%s のリンク解除に失敗しました"
#: ftparchive/writer.cc:264
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** %s %s ˥󥯤Τ˼Ԥޤ"
+msgstr "*** %s を %s にリンクするのに失敗しました"
#: ftparchive/writer.cc:274
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " 󥯤򳰤¤ %sB ãޤ\n"
+msgstr " リンクを外す制限の %sB に到達しました。\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
-msgstr "%s stat ˼Ԥޤ"
+msgstr "%s の状態を取得するのに失敗しました"
#: ftparchive/writer.cc:386
msgid "Archive had no package field"
-msgstr "֤˥ѥåեɤޤǤ"
+msgstr "アーカイブにパッケージフィールドがありませんでした"
#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
-msgstr " %s override ȥ꤬ޤ\n"
+msgstr " %s に override エントリがありません\n"
#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
-msgstr " %1$s ƥʤ %3$s ǤϤʤ %2$s Ǥ\n"
+msgstr " %1$s メンテナは %3$s ではなく %2$s です\n"
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
-msgstr "顼 %s Ǥޤ"
+msgstr "内部エラー、メンバー %s を特定できません"
#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - γƤ˼Ԥޤ"
+msgstr "realloc - メモリの割り当てに失敗しました"
#: ftparchive/override.cc:38 ftparchive/override.cc:146
#, c-format
msgid "Unable to open %s"
-msgstr "'%s' 򥪡ץǤޤ"
+msgstr "'%s' をオープンできません"
#: ftparchive/override.cc:64 ftparchive/override.cc:170
#, c-format
msgid "Malformed override %s line %lu #1"
-msgstr " override %s %lu #1"
+msgstr "不正な override %s %lu 行目 #1"
#: ftparchive/override.cc:78 ftparchive/override.cc:182
#, c-format
msgid "Malformed override %s line %lu #2"
-msgstr " override %s %lu #2"
+msgstr "不正な override %s %lu 行目 #2"
#: ftparchive/override.cc:92 ftparchive/override.cc:195
#, c-format
msgid "Malformed override %s line %lu #3"
-msgstr " override %s %lu #3"
+msgstr "不正な override %s %lu 行目 #3"
#: ftparchive/override.cc:131 ftparchive/override.cc:205
#, c-format
msgid "Failed to read the override file %s"
-msgstr "override ե %s ɤ߹Τ˼Ԥޤ"
+msgstr "override ファイル %s を読み込むのに失敗しました"
#: ftparchive/multicompress.cc:75
#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' ̤Τΰ̥르ꥺǤ"
+msgstr "'%s' は未知の圧縮アルゴリズムです"
#: ftparchive/multicompress.cc:105
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "̽ %s ˤϰ̥åȤɬפǤ"
+msgstr "圧縮出力 %s には圧縮セットが必要です"
#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "ҥץؤ IPC ѥפκ˼Ԥޤ"
+msgstr "子プロセスへの IPC パイプの作成に失敗しました"
#: ftparchive/multicompress.cc:198
msgid "Failed to create FILE*"
-msgstr "FILE* κ˼Ԥޤ"
+msgstr "FILE* の作成に失敗しました"
#: ftparchive/multicompress.cc:201
msgid "Failed to fork"
-msgstr "fork ˼Ԥޤ"
+msgstr "fork に失敗しました"
#: ftparchive/multicompress.cc:215
msgid "Compress child"
-msgstr "̻ҥץ"
+msgstr "圧縮子プロセス"
#: ftparchive/multicompress.cc:238
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "顼%s κ˼Ԥޤ"
+msgstr "内部エラー、%s の作成に失敗しました"
#: ftparchive/multicompress.cc:289
msgid "Failed to create subprocess IPC"
-msgstr "ҥץ IPC ˼Ԥޤ"
+msgstr "子プロセス IPC の生成に失敗しました"
#: ftparchive/multicompress.cc:324
msgid "Failed to exec compressor "
-msgstr "ʲΰ̥ġμ¹Ԥ˼Ԥޤ: "
+msgstr "以下の圧縮ツールの実行に失敗しました: "
#: ftparchive/multicompress.cc:363
msgid "decompressor"
-msgstr "Ÿġ"
+msgstr "展開ツール"
#: ftparchive/multicompress.cc:406
msgid "IO to subprocess/file failed"
-msgstr "ҥץ/եؤ IO Ԥޤ"
+msgstr "子プロセス/ファイルへの IO が失敗しました"
#: ftparchive/multicompress.cc:458
msgid "Failed to read while computing MD5"
-msgstr "MD5 η׻ɤ߹ߤ˼Ԥޤ"
+msgstr "MD5 の計算中に読み込みに失敗しました"
#: ftparchive/multicompress.cc:475
#, c-format
msgid "Problem unlinking %s"
-msgstr "%s unlink ꤬ȯޤ"
+msgstr "%s のリンク解除で問題が発生しました"
#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "%s %s ˥͡ǤޤǤ"
+msgstr "%s を %s に名前変更できませんでした"
#: cmdline/apt-get.cc:120
msgid "Y"
@@ -641,300 +636,296 @@ msgstr "Y"
#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
-msgstr "ɽŸ顼 - %s"
+msgstr "正規表現の展開エラー - %s"
#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
-msgstr "ʲΥѥåˤʤ¸طޤ:"
+msgstr "以下のパッケージには満たせない依存関係があります:"
#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
-msgstr "%s ϥ󥹥ȡ뤵Ƥޤ"
+msgstr "しかし、%s はインストールされています"
#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
-msgstr "%s ϥ󥹥ȡ뤵褦ȤƤޤ"
+msgstr "しかし、%s はインストールされようとしています"
#: cmdline/apt-get.cc:336
msgid "but it is not installable"
-msgstr "󥹥ȡ뤹뤳ȤǤޤ"
+msgstr "しかし、インストールすることができません"
#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
-msgstr "ϲۥѥåǤ"
+msgstr "しかし、これは仮想パッケージです"
#: cmdline/apt-get.cc:341
msgid "but it is not installed"
-msgstr "󥹥ȡ뤵Ƥޤ"
+msgstr "しかし、インストールされていません"
#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
-msgstr "󥹥ȡ뤵褦ȤƤޤ"
+msgstr "しかし、インストールされようとしていません"
#: cmdline/apt-get.cc:346
msgid " or"
-msgstr " ޤ"
+msgstr " または"
#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
-msgstr "ʲΥѥå˥󥹥ȡ뤵ޤ:"
+msgstr "以下のパッケージが新たにインストールされます:"
#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
-msgstr "ʲΥѥåϡֺפޤ:"
+msgstr "以下のパッケージは「削除」されます:"
#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
-msgstr "ʲΥѥåαޤ:"
+msgstr "以下のパッケージは保留されます:"
#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
-msgstr "ʲΥѥåϥåץ졼ɤޤ:"
+msgstr "以下のパッケージはアップグレードされます:"
#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
-msgstr "ʲΥѥåϡ֥󥰥졼ɡפޤ:"
+msgstr "以下のパッケージは「ダウングレード」されます:"
#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
-msgstr "ʲѹػߥѥåѹޤ:"
+msgstr "以下の変更禁止パッケージは変更されます:"
#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
-msgstr "%s (%s Τ) "
+msgstr "%s (%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 ""
-"ٹ: ʲԲķѥåޤ\n"
-"򤷤褦ȤƤ뤫Ȥ狼ʤϡ¹ԤƤϤޤ!"
+"警告: 以下の不可欠パッケージが削除されます。\n"
+"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "åץ졼: %lu ġ󥹥ȡ: %lu ġ"
+msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
-msgstr "ƥ󥹥ȡ: %lu ġ"
+msgstr "再インストール: %lu 個、"
#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
-msgstr "󥰥졼: %lu ġ"
+msgstr "ダウングレード: %lu 個、"
#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ": %lu ġα: %lu ġ\n"
+msgstr "削除: %lu 個、保留: %lu 個。\n"
#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ĤΥѥå˥󥹥ȡޤϺƤޤ\n"
+msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
-msgstr "¸ط褷Ƥޤ..."
+msgstr "依存関係を解決しています ..."
#: cmdline/apt-get.cc:652
msgid " failed."
-msgstr " Ԥޤ"
+msgstr " 失敗しました。"
#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
-msgstr "¸طľȤǤޤ"
+msgstr "依存関係を訂正できません"
#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
-msgstr "åץ졼ɥåȤǾǤޤ"
+msgstr "アップグレードセットを最小化できません"
#: cmdline/apt-get.cc:660
msgid " Done"
-msgstr " λ"
+msgstr " 完了"
#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-"ľˤ 'apt-get -f install' ¹Ԥɬפ뤫⤷ޤ"
-""
+"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
+"ん。"
#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
-msgstr "̤ΰ¸طޤ-f ץƤ"
+msgstr "未解決の依存関係があります。-f オプションを試してください。"
#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ٹ: ʲΥѥåǧڤƤޤ!"
+msgstr "警告: 以下のパッケージは認証されていません!"
#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "認証の警告は上書きされました。\n"
#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
-msgstr "ڤʤˤΥѥå򥤥󥹥ȡ뤷ޤ [y/N]? "
+msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? "
#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
-msgstr "ĤΥѥåǧڤޤǤ"
+msgstr "いくつかのパッケージを認証できませんでした"
#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
-msgstr "꤬ȯ-y ץ --force-yes ʤǻѤޤ"
+msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
-msgstr "ѥåʤФʤޤ󤬡̵ˤʤäƤޤ"
+msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
#: cmdline/apt-get.cc:775
-#, fuzzy
msgid "Internal error, Ordering didn't finish"
-msgstr "顼diversion ɲ"
+msgstr "内部エラー、調整が終わっていません"
#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
-msgstr "ɥǥ쥯ȥåǤޤ"
+msgstr "ダウンロードディレクトリをロックできません"
#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
-msgstr "ΥꥹȤɤळȤǤޤ"
+msgstr "ソースのリストを読むことができません。"
#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください"
#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr "%2$sB %1$sB Υ֤ɬפޤ\n"
+msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n"
#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr "%sB Υ֤ɬפޤ\n"
+msgstr "%sB のアーカイブを取得する必要があります。\n"
#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Ÿɲä %sB Υǥ̤񤵤ޤ\n"
+msgstr "展開後に追加で %sB のディスク容量が消費されます。\n"
#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Ÿ %sB Υǥ̤ޤ\n"
+msgstr "展開後に %sB のディスク容量が解放されます。\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 "%s ˽ʬʶڡޤ"
+msgstr "%s の空き領域を測定できません"
#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "%s ˽ʬʶڡޤ"
+msgstr "%s に充分な空きスペースがありません。"
#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Trivial Only ꤵޤϴñǤϤޤ"
+msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
#: 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 ""
-"ǽΤ뤳Ȥ򤷤褦ȤƤޤ\n"
-"³Ԥˤϡ'%s' Ȥե졼򥿥פƤ\n"
+"重大な問題を引き起こす可能性のあることをしようとしています。\n"
+"続行するには、'%s' というフレーズをタイプしてください。\n"
" ?] "
#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
-msgstr "Ǥޤ"
+msgstr "中断しました。"
#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
-msgstr "³Ԥޤ [Y/n]? "
+msgstr "続行しますか [Y/n]? "
#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "%s μ˼Ԥޤ %s\n"
+msgstr "%s の取得に失敗しました %s\n"
#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
-msgstr "ĤΥեμ˼Ԥޤ"
+msgstr "いくつかのファイルの取得に失敗しました"
#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
-msgstr "ɥ꡼⡼ɤǥѥåΥɤλޤ"
+msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"ĤΥ֤Ǥޤapt-get update ¹Ԥ뤫 --fix-"
-"missing ץդƻƤߤƤ"
+"いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-"
+"missing オプションを付けて試してみてください。"
#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing ȥǥ򴹤ϸƱˤϥݡȤƤޤ"
+msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
-msgstr "­ʤѥåľȤǤޤ"
+msgstr "足りないパッケージを直すことができません。"
#: cmdline/apt-get.cc:996
msgid "Aborting install."
-msgstr "󥹥ȡǤޤ"
+msgstr "インストールを中断します。"
#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
-msgstr "ա%2$s %1$s 򤷤ޤ\n"
+msgstr "注意、%2$s の代わりに %1$s を選択します\n"
#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"˥󥹥ȡ뤵Ƥꥢåץ졼ɤꤵƤʤᡢ%s 򥹥å"
-"ޤ\n"
+msgstr "すでにインストールされておりアップグレードも設定されていないため、%s をスキップします。\n"
#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "ѥå %s ϥ󥹥ȡ뤵ƤʤᡢϤǤޤ\n"
+msgstr "パッケージ %s はインストールされていないため、削除はできません\n"
#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
-msgstr "%s ϰʲΥѥå󶡤Ƥ벾ۥѥåǤ:\n"
+msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
#: cmdline/apt-get.cc:1081
msgid " [Installed]"
-msgstr " [󥹥ȡѤ]"
+msgstr " [インストール済み]"
#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
-msgstr "󥹥ȡ뤹ѥåŪ򤹤ɬפޤ"
+msgstr "インストールするパッケージを明示的に選択する必要があります。"
#: cmdline/apt-get.cc:1091
#, c-format
@@ -943,87 +934,83 @@ msgid ""
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"ѥå %s ϥǡ١ˤ¸ߤޤѤǤޤ\n"
-"餯ΥѥåĤʤ⤦ŤʤäƤ뤫\n"
-"뤤̤ΥΤߤѤǤʤȤͤޤ\n"
+"パッケージ %s はデータベースには存在しますが、利用できません。\n"
+"おそらく、そのパッケージが見つからないか、もう古くなっているか、\n"
+"あるいは別のソースからのみしか利用できないという状況が考えられます\n"
#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
-msgstr "ʲΥѥå֤Ƥޤ:"
+msgstr "しかし、以下のパッケージで置き換えられています:"
#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
-msgstr "ѥå %s ˤϥ󥹥ȡ䤬ޤ"
+msgstr "パッケージ %s にはインストール候補がありません"
#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "ɤǤʤᡢ%s κƥ󥹥ȡԲǽǤ\n"
+msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n"
#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "%s ϴ˺ǿСǤ\n"
+msgstr "%s はすでに最新バージョンです。\n"
#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "'%2$s' Υ꡼ '%1$s' ĤޤǤ"
+msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr "'%2$s' ΥС '%1$s' ĤޤǤ"
+msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
-msgstr "%3$s ˤϥС %1$s (%2$s) 򤷤ޤ\n"
+msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
-msgstr "update ޥɤϰޤ"
+msgstr "update コマンドは引数をとりません"
#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
-msgstr "list ǥ쥯ȥå뤳ȤǤޤ"
+msgstr "list ディレクトリをロックできません"
#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
-msgstr ""
-"ĤΥǥåեΥɤ˼Ԥޤ̵뤵줿"
-"뤤ϸŤΤѤޤ"
+msgstr "いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視されるか、古いものが代わりに使われます。"
#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "顼AllUpgrade ˲ޤ"
+msgstr "内部エラー、AllUpgrade が何かを破壊しました"
#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
-msgstr "ѥå %s դޤ"
+msgstr "パッケージ %s が見つかりません"
#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
-msgstr ": ɽ '%2$s' Ф %1$s 򤷤ޤ\n"
+msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-"ʲ褹뤿 'apt-get -f install' ¹Ԥɬפ뤫⤷"
-"ޤ:"
+"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
+"ません:"
#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
-msgstr ""
-"̤ΰ¸طǤ'apt-get -f install' ¹ԤƤߤƤ(ޤϲˡ"
-"Ƥ)"
+msgstr "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法を明示してください)。"
#: cmdline/apt-get.cc:1570
msgid ""
@@ -1032,10 +1019,10 @@ msgid ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"󥹥ȡ뤹뤳ȤǤʤѥåޤ餯ꤨ\n"
-"ʤ׵ᤷɬפʥѥåޤƤʤä \n"
-"Incoming ưƤʤ԰ǥǥȥӥ塼Ѥ\n"
-"ƤΤȹͤޤ"
+"インストールすることができないパッケージがありました。おそらく、あり得\n"
+"ない状況を要求したか、(不安定版ディストリビューションを使用しているの\n"
+"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
+"動されていないことが考えられます。"
#: cmdline/apt-get.cc:1578
msgid ""
@@ -1043,124 +1030,122 @@ msgid ""
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"ñԤäʤΤǡΥѥåñ˥󥹥ȡǤʤ\n"
-"ǽ⤤ǤΤᡢΥѥåؤΥХݡȤäƤ\n"
-""
+"単純な操作を行っただけなので、このパッケージは単にインストールできない\n"
+"可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n"
+"さい。"
#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
-msgstr "ʲξ󤬤褹뤿ΩĤ⤷ޤ:"
+msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
#: cmdline/apt-get.cc:1586
msgid "Broken packages"
-msgstr "줿ѥå"
+msgstr "壊れたパッケージ"
#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
-msgstr "ʲ̥ѥå󥹥ȡ뤵ޤ:"
+msgstr "以下の特別パッケージがインストールされます:"
#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
-msgstr "ƥѥå:"
+msgstr "提案パッケージ:"
#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
-msgstr "侩ѥå:"
+msgstr "推奨パッケージ:"
#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
-msgstr "åץ졼ɥѥå򸡽ФƤޤ... "
+msgstr "アップグレードパッケージを検出しています ... "
#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
-msgstr ""
+msgstr "失敗"
#: cmdline/apt-get.cc:1712
msgid "Done"
-msgstr "λ"
+msgstr "完了"
#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
-#, fuzzy
msgid "Internal error, problem resolver broke stuff"
-msgstr "顼AllUpgrade ˲ޤ"
+msgstr "内部エラー、問題リゾルバが何かを破壊しました"
#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr ""
-"ˤϾʤȤҤȤĤΥѥå̾ꤹɬפޤ"
+"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
-msgstr "%s ΥѥåĤޤ"
+msgstr "%s のソースパッケージが見つかりません"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n"
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
-msgstr "%s ˽ʬʶڡޤ"
+msgstr "%s に充分な空きスペースがありません"
#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "%2$sB %1$sB Υ֤ɬפޤ\n"
+msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "%sB Υ֤ɬפޤ\n"
+msgstr "%sB のソースアーカイブを取得する必要があります。\n"
#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
-msgstr " %s \n"
+msgstr "ソース %s を取得\n"
#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
-msgstr "ĤΥ֤μ˼Ԥޤ"
+msgstr "いくつかのアーカイブの取得に失敗しました。"
#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n"
+msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr "Ÿޥ '%s' Ԥޤ\n"
+msgstr "展開コマンド '%s' が失敗しました。\n"
#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "ӥɥޥ '%s' Ԥޤ\n"
+msgstr "ビルドコマンド '%s' が失敗しました。\n"
#: cmdline/apt-get.cc:2105
msgid "Child process failed"
-msgstr "ҥץԤޤ"
+msgstr "子プロセスが失敗しました"
#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"builddeps åѥå򾯤ʤȤ 1 Ļꤹɬפޤ"
+msgstr "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "%s build-dependency 뤳ȤǤޤ"
+msgstr "%s のビルド依存情報を取得できません"
#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
-msgstr "%s ˤ build depends ꤵƤޤ\n"
+msgstr "%s にはビルド依存情報が指定されていません。\n"
#: cmdline/apt-get.cc:2221
#, c-format
@@ -1168,8 +1153,8 @@ msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"ѥå %3$s Ĥʤᡢ%2$s Ф %1$s ΰ¸ط"
-"Ǥޤ"
+"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
+"ができません"
#: cmdline/apt-get.cc:2273
#, c-format
@@ -1177,33 +1162,33 @@ msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"ǽ %3$s ϤСˤĤƤ׵ʤᡢ%2$s "
-" %1$s ΰ¸طȤǤޤ"
+"入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
+"する %1$s の依存関係を満たすことができません"
#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"%2$s ΰ¸ط %1$s ȤǤޤ: 󥹥ȡ뤵줿 %3$s ѥ"
-"Ͽޤ"
+"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
+"ケージは新しすぎます"
#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%2$s ΰ¸ط %1$s ȤǤޤ: %3$s"
+msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s Build-dependency ȤǤޤǤ"
+msgstr "%s のビルド依存関係を満たすことができませんでした。"
#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
-msgstr "build dependency ν˼Ԥޤ"
+msgstr "ビルド依存関係の処理に失敗しました"
#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
-msgstr "ݡȤƤ⥸塼:"
+msgstr "サポートされているモジュール:"
#: cmdline/apt-get.cc:2424
msgid ""
@@ -1246,73 +1231,72 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"ˡ: apt-get [ץ] ޥ\n"
-" apt-get [ץ] install|remove ѥå̾1 [ѥå̾"
-"2 ...]\n"
-" apt-get [ץ] source ѥå̾1 [ѥå̾2 ...]\n"
+"使用法: apt-get [オプション] コマンド\n"
+" apt-get [オプション] install|remove パッケージ名1 [パッケージ名2 ...]\n"
+" apt-get [オプション] source パッケージ名1 [パッケージ名2 ...]\n"
"\n"
-"apt-get ϡѥå/󥹥ȡ뤹뤿δñʥ\n"
-"ɥ饤󥤥󥿥եǤäȤ褯Ȥ륳ޥɤϡupdate \n"
-" install Ǥ\n"
+"apt-get は、パッケージをダウンロード/インストールするための簡単なコマ\n"
+"ンドラインインタフェースです。もっともよく使われるコマンドは、update \n"
+"と install です。\n"
"\n"
-"ޥ:\n"
-" update - ѥåꥹȤޤ\n"
-" upgrade - åץ졼ɤԤޤ\n"
-" install - ѥå򥤥󥹥ȡ뤷ޤ\n"
-" (pkg libc6.deb ǤϤʤ libc6 Τ褦˻ꤷޤ)\n"
-" remove - ѥåޤ\n"
-" source - ֤ɤޤ\n"
-" build-dep - ѥåι۰¸طꤷޤ\n"
-" dist-upgrade - ǥȥӥ塼򥢥åץ졼ɤޤ\n"
-" (apt-get(8) 򻲾)\n"
-" dselect-upgrade - dselect ˤޤ\n"
-" clean - ɤ֥եޤ\n"
-" autoclean - ɤŤ֥եޤ\n"
-" check - 줿¸طʤåޤ\n"
+"コマンド:\n"
+" update - パッケージリストを取得・更新します\n"
+" upgrade - アップグレードを行います\n"
+" install - 新規パッケージをインストールします\n"
+" (pkg は libc6.deb ではなく libc6 のように指定します)\n"
+" remove - パッケージを削除します\n"
+" source - ソースアーカイブをダウンロードします\n"
+" build-dep - ソースパッケージの構築依存関係を設定します\n"
+" dist-upgrade - ディストリビューションをアップグレードします\n"
+" (apt-get(8) を参照)\n"
+" dselect-upgrade - dselect の選択に従います\n"
+" clean - ダウンロードしたアーカイブファイルを削除します\n"
+" autoclean - ダウンロードした古いアーカイブファイルを削除します\n"
+" check - 壊れた依存関係がないかチェックします\n"
"\n"
-"ץ:\n"
-" -h Υإפɽ\n"
-" -q ե˽ϲǽʷˤ - ץ쥹ɽ򤷤ʤ\n"
-" -qq 顼ʳɽʤ\n"
-" -d ɤΤ߹Ԥ - ֤Υ󥹥ȡŸϹԤʤ\n"
-" -s ºݤˤϼ¹Ԥʤ¹ԥߥ졼Τ߹Ԥ\n"
-" -y Ƥ䤤碌 Yes ץץȤ֤ʤ\n"
-" -f åǼԤƤ³Ԥ\n"
-" -m ֤¸ߤʤ³Ԥ\n"
-" -u åץ졼ɤѥåɽ\n"
-" -b ѥåӥɤԤ\n"
-" -V ĹʥСʥФɽ\n"
-" -c=? ꤷեɤ߹\n"
-" -o=? Ǥդꥪץꤹ, -o dir::cache=/tmp\n"
-"ץ˴ؤƤϡޥ˥奢ڡ apt-get(8)sources.list(5)\n"
-"apt.conf(5) 򻲾ȤƤ\n"
-" APT Super Cow Powers Ƥޤ\n"
+"オプション:\n"
+" -h このヘルプを表示する\n"
+" -q ログファイルに出力可能な形式にする - プログレス表示をしない\n"
+" -qq エラー以外は表示しない\n"
+" -d ダウンロードのみ行う - アーカイブのインストールや展開は行わない\n"
+" -s 実際には実行しない。実行シミュレーションのみ行う\n"
+" -y すべての問い合わせに Yes で答え、プロンプトは返さない\n"
+" -f 整合性チェックで失敗しても処理を続行する\n"
+" -m アーカイブが存在しない場合も続行する\n"
+" -u アップグレードされるパッケージも表示する\n"
+" -b ソースパッケージを取得し、ビルドを行う\n"
+" -V 冗長なバージョンナンバを表示する\n"
+" -c=? 指定した設定ファイルを読み込む\n"
+" -o=? 任意の設定オプションを指定する, 例 -o dir::cache=/tmp\n"
+"オプション・設定に関しては、マニュアルページ apt-get(8)、sources.list(5)、\n"
+"apt.conf(5) を参照してください。\n"
+" この APT は Super Cow Powers 化されています。\n"
#: cmdline/acqprogress.cc:55
msgid "Hit "
-msgstr "ҥå "
+msgstr "ヒット "
#: cmdline/acqprogress.cc:79
msgid "Get:"
-msgstr ":"
+msgstr "取得:"
#: cmdline/acqprogress.cc:110
msgid "Ign "
-msgstr "̵ "
+msgstr "無視 "
#: cmdline/acqprogress.cc:114
msgid "Err "
-msgstr "顼 "
+msgstr "エラー "
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "%sB %s Ǽޤ (%sB/s)\n"
+msgstr "%sB を %s で取得しました (%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
msgid " [Working]"
-msgstr " []"
+msgstr " [処理中]"
#: cmdline/acqprogress.cc:271
#, c-format
@@ -1321,13 +1305,13 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"ǥѹ: \n"
+"メディア変更: \n"
" '%s'\n"
-"ȥ٥դǥɥ饤 '%s' enter 򲡤Ƥ\n"
+"とラベルの付いたディスクをドライブ '%s' に入れて enter を押してください\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
-msgstr "ʥѥå쥳ɤǤ!"
+msgstr "不明なパッケージレコードです!"
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1342,228 +1326,228 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"ˡ: apt-sortpkgs [ץ] ե̾1 [ե̾2 ...]\n"
+"使用方法: apt-sortpkgs [オプション] ファイル名1 [ファイル名2 ...]\n"
"\n"
-"apt-sortpkgs ϥѥåե򥽡Ȥ뤿δñʥġǤ\n"
-"-s ץϥեμ򼨤˻Ѥޤ\n"
+"apt-sortpkgs はパッケージファイルをソートするための簡単なツールです。\n"
+"-s オプションはファイルの種類を示すために使用されます。\n"
"\n"
-"ץ:\n"
-" -h Υإפɽ\n"
-" -s ե륽ȤѤ\n"
-" -c=? ꤷեɤߤ\n"
-" -o=? ꤷꥪץŬѤ(: -o dir::cache=/tmp)\n"
+"オプション:\n"
+" -h このヘルプを表示する\n"
+" -s ソースファイルソートを使用する\n"
+" -c=? 指定した設定ファイルを読み込む\n"
+" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
#: dselect/install:32
msgid "Bad default setting!"
-msgstr "ǥեȤ꤬褯ޤ!"
+msgstr "不正なデフォルト設定です!"
#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
#: dselect/install:104 dselect/update:45
msgid "Press enter to continue."
-msgstr "enter 򲡤³Ԥޤ"
+msgstr "enter を押すと続行します。"
#: dselect/install:100
msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Ÿ˥顼ȯޤ󥹥ȡ뤵줿ѥå"
+msgstr "展開中にエラーが発生しました。インストールされたパッケージを"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr "ꤷޤˤꡢ顼ʣФ뤫¸طηǡ"
+msgstr "設定します。これにより、エラーが複数出るか、依存関係の欠如に"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "륨顼Ф뤫⤷ޤ󡣤ˤϤʤ嵭Υå"
+msgstr "よるエラーが出るかもしれません。これには問題はなく、上記のメッセージ"
#: dselect/install:103
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
-msgstr "פǤ [I]nstall ټ¹ԤƤ"
+msgstr "が重要です。これを修正して「導入」を再度実行してください"
#: dselect/update:30
msgid "Merging available information"
-msgstr "ǽޡƤޤ"
+msgstr "入手可能情報をマージしています"
#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
-msgstr "ѥפ˼Ԥޤ"
+msgstr "パイプの生成に失敗しました"
#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
-msgstr "gzip μ¹Ԥ˼Ԥޤ"
+msgstr "gzip の実行に失敗しました"
#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
-msgstr "줿"
+msgstr "壊れたアーカイブ"
#: apt-inst/contrib/extracttar.cc:195
msgid "Tar checksum failed, archive corrupted"
-msgstr "tar åबԤޤ֤Ƥޤ"
+msgstr "tar チェックサムが失敗しました。アーカイブが壊れています"
#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "̤Τ TAR إå %u %s"
+msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
#: apt-inst/contrib/arfile.cc:73
msgid "Invalid archive signature"
-msgstr "ʥֽ̾"
+msgstr "不正なアーカイブ署名"
#: apt-inst/contrib/arfile.cc:81
msgid "Error reading archive member header"
-msgstr "֥Хإåɤ߹ߤ˼Ԥޤ"
+msgstr "アーカイブメンバーヘッダの読み込みに失敗しました"
#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
msgid "Invalid archive member header"
-msgstr "ʥ֥Хإå"
+msgstr "不正なアーカイブメンバーヘッダ"
#: apt-inst/contrib/arfile.cc:131
msgid "Archive is too short"
-msgstr "֤­Ƥޤ"
+msgstr "アーカイブが不足しています"
#: apt-inst/contrib/arfile.cc:135
msgid "Failed to read the archive headers"
-msgstr "֥إåɤ߹ߤ˼Ԥޤ"
+msgstr "アーカイブヘッダの読み込みに失敗しました"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
-msgstr "󥯤ƤΡɤ DropNode ƤФޤ"
+msgstr "リンクされているノードで DropNode が呼ばれました"
#: apt-inst/filelist.cc:416
msgid "Failed to locate the hash element!"
-msgstr "ϥåǤꤹ뤳ȤǤޤ!"
+msgstr "ハッシュ要素を特定することができません!"
#: apt-inst/filelist.cc:463
msgid "Failed to allocate diversion"
-msgstr "diversion γƤ˼Ԥޤ"
+msgstr "diversion の割り当てに失敗しました"
#: apt-inst/filelist.cc:468
msgid "Internal error in AddDiversion"
-msgstr "AddDiversion Ǥ顼"
+msgstr "AddDiversion での内部エラー"
#: apt-inst/filelist.cc:481
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "%s -> %s %s/%s diversion 񤭤褦ȤƤޤ"
+msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています"
#: apt-inst/filelist.cc:510
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr "%s -> %s diversion ŤɲäƤޤ"
+msgstr "%s -> %s の diversion が二重に追加されています"
#: apt-inst/filelist.cc:553
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr "ե %s/%s ʣƤޤ"
+msgstr "設定ファイル %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 "%s ν񤭹ߤ˼Ԥޤ"
+msgstr "ファイル %s の書き込みに失敗しました"
#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
-msgstr "%s Υ˼Ԥޤ"
+msgstr "%s のクローズに失敗しました"
#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
-msgstr "ѥ %s Ĺޤ"
+msgstr "パス %s は長すぎます"
#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
-msgstr "%s ʣŸƤޤ"
+msgstr "%s を複数回展開しています"
#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
-msgstr "ǥ쥯ȥ %s divert Ƥޤ"
+msgstr "ディレクトリ %s は divert されています"
#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-"Υѥå diversion ΥåȤ %s/%s ˽񤭹⤦ȤƤޤ"
+"このパッケージは diversion のターゲットの %s/%s に書き込もうとしています"
#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
-msgstr "diversion ѥĹޤ"
+msgstr "diversion パスが長すぎます"
#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr "ǥ쥯ȥ %s ǥ쥯ȥִ褦ȤƤޤ"
+msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
-msgstr "ϥåХǥΡɤꤹΤ˼Ԥޤ"
+msgstr "ハッシュバケツ内でノードを特定するのに失敗しました"
#: apt-inst/extract.cc:287
msgid "The path is too long"
-msgstr "ѥĹޤ"
+msgstr "パスが長すぎます"
#: apt-inst/extract.cc:417
#, c-format
msgid "Overwrite package match with no version for %s"
-msgstr "%s ФСΤʤѥåޥå񤭤ޤ"
+msgstr "%s に対するバージョンのないパッケージマッチを上書きします"
#: apt-inst/extract.cc:434
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr "ե %s/%s ѥå %s ΤΤ񤭤ޤ"
+msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
-msgstr "%s ɤ߹ळȤǤޤ"
+msgstr "%s を読み込むことができません"
#: apt-inst/extract.cc:494
#, c-format
msgid "Unable to stat %s"
-msgstr "%s stat Ǥޤ"
+msgstr "%s の状態を取得できません"
#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
#, c-format
msgid "Failed to remove %s"
-msgstr "%s κ˼Ԥޤ"
+msgstr "%s の削除に失敗しました"
#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
#, c-format
msgid "Unable to create %s"
-msgstr "%s Ǥޤ"
+msgstr "%s を作成できません"
#: apt-inst/deb/dpkgdb.cc:118
#, c-format
msgid "Failed to stat %sinfo"
-msgstr "%sinfo stat ˼Ԥޤ"
+msgstr "%sinfo の状態の取得に失敗しました"
#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
-msgstr "info temp ǥ쥯ȥƱե륷ƥˤʤФʤޤ"
+msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません"
#. 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 "ѥåꥹȤɤߤǤޤ"
+msgstr "パッケージリストを読み込んでいます"
#: apt-inst/deb/dpkgdb.cc:180
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr "ǥ쥯ȥ %sinfo ؤΰư˼Ԥޤ"
+msgstr "管理ディレクトリ %sinfo への移動に失敗しました"
#: 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 "ѥå̾顼"
+msgstr "パッケージ名取得中の内部エラー"
#: apt-inst/deb/dpkgdb.cc:205
msgid "Reading file listing"
-msgstr "եꥹȤɤ߹Ǥޤ"
+msgstr "ファイルリストを読み込んでいます"
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
@@ -1572,284 +1556,280 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"ꥹȥե '%sinfo/%s' Υץ˼ԤޤΥե򸵤᤹"
-"ȤǤʤʤ顢Ƥˤ¨¤ƱСΥѥåƥ"
-"ȡ뤷Ƥ!"
+"リストファイル '%sinfo/%s' のオープンに失敗しました。このファイルを元に戻すこ"
+"とができないなら、その内容を空にして即座に同じバージョンのパッケージを再イン"
+"ストールしてください!"
#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "ꥹȥե %sinfo/%s ɤ߹ߤ˼Ԥޤ"
+msgstr "リストファイル %sinfo/%s の読み込みに失敗しました"
#: apt-inst/deb/dpkgdb.cc:266
msgid "Internal error getting a node"
-msgstr "顼Ρɤμ"
+msgstr "内部エラー、ノードの取得"
#: apt-inst/deb/dpkgdb.cc:309
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "diversions ե %sdiversions Υץ˼Ԥޤ"
+msgstr "diversions ファイル %sdiversions のオープンに失敗しました"
#: apt-inst/deb/dpkgdb.cc:324
msgid "The diversion file is corrupted"
-msgstr "diversion ե뤬Ƥޤ"
+msgstr "diversion ファイルが壊れています"
#: 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 "diversion եʹԤޤ: %s"
+msgstr "diversion ファイルに不正な行があります: %s"
#: apt-inst/deb/dpkgdb.cc:362
msgid "Internal error adding a diversion"
-msgstr "顼diversion ɲ"
+msgstr "内部エラー、diversion の追加"
#: apt-inst/deb/dpkgdb.cc:383
msgid "The pkg cache must be initialized first"
-msgstr "ǽ˥ѥååʤФʤޤ"
+msgstr "最初にパッケージキャッシュを初期化しなければなりません"
#: apt-inst/deb/dpkgdb.cc:386
msgid "Reading file list"
-msgstr "եꥹȤɤߤǤޤ"
+msgstr "ファイルリストを読み込んでいます"
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Package: إå򸫤ĤΤ˼Ԥޤեå %lu"
+msgstr "Package: ヘッダを見つけるのに失敗しました。オフセット %lu"
#: apt-inst/deb/dpkgdb.cc:465
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "status ե ConfFile 󤬤ޤեå %lu"
+msgstr "status ファイルに不正な ConfFile セクションがあります。オフセット %lu"
#: apt-inst/deb/dpkgdb.cc:470
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr "MD5 βϥ顼եå %lu"
+msgstr "MD5 の解析エラー。オフセット %lu"
#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "'%s' Фʤᡢ DEB ֤ǤϤޤ"
+msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません"
#: apt-inst/deb/debfile.cc:52
#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"'%s' ޤ '%s' Фʤᡢ DEB ֤ǤϤޤ"
+msgstr "'%s' または '%s' メンバーがないため、これは正しい DEB アーカイブではありません"
#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
-msgstr "%s ѹǤޤǤ"
+msgstr "%s に変更できませんでした"
#: apt-inst/deb/debfile.cc:138
msgid "Internal error, could not locate member"
-msgstr "顼ФǤޤ"
+msgstr "内部エラー、メンバーを特定できません"
#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
-msgstr "եǤޤǤ"
+msgstr "正しいコントロールファイルを特定できませんでした"
#: apt-inst/deb/debfile.cc:256
msgid "Unparsable control file"
-msgstr "ϤǤʤե"
+msgstr "解析できないコントロールファイル"
#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "cdrom ǡ١ %s ɤߤळȤǤޤ"
+msgstr "CD-ROM データベース %s を読み込むことができません"
#: methods/cdrom.cc:123
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
-msgstr ""
-" CD APT ǧˤ apt-cdrom ѤƤ CD "
-"ä뤿 apt-get update ϻѤǤޤ"
+msgstr "この CD-ROM を APT に認識させるには apt-cdrom を使用してください。新しい CD-ROM を追加するために apt-get update は使用できません。"
#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
-msgstr "CD 㤤ޤ"
+msgstr "CD が違います"
#: methods/cdrom.cc:164
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "%s CD-ROM ϻΤᥢޥȤ뤳ȤǤޤ"
+msgstr "%s の CD-ROM は使用中のためアンマウントすることができません。"
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "ե뤬ߤĤޤ"
+msgstr "ディスクが見つかりません。"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
-msgstr "ե뤬ߤĤޤ"
+msgstr "ファイルが見つかりません"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
-msgstr "stat ˼Ԥޤ"
+msgstr "状態の取得に失敗しました"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
-msgstr "ѹ˼Ԥޤ"
+msgstr "変更時刻の設定に失敗しました"
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
-msgstr " URI Ǥ URI // ǻϤޤäƤϤޤ"
+msgstr "不正な URI です。ローカルの URI は // で始まってはいけません"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:162
msgid "Logging in"
-msgstr "󤷤Ƥޤ"
+msgstr "ログインしています"
#: methods/ftp.cc:168
msgid "Unable to determine the peer name"
-msgstr "ԥ͡ꤹ뤳ȤǤޤ"
+msgstr "ピアネームを決定することができません"
#: methods/ftp.cc:173
msgid "Unable to determine the local name"
-msgstr "͡ꤹ뤳ȤǤޤ"
+msgstr "ローカルネームを決定することができません"
#: methods/ftp.cc:204 methods/ftp.cc:232
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "Ф³䤵ޤ: %s"
+msgstr "サーバから接続を拒絶されました。応答: %s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER ԡб: %s"
+msgstr "USER 失敗、サーバ応答: %s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS ԡб: %s"
+msgstr "PASS 失敗、サーバ応答: %s"
#: methods/ftp.cc:237
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"ץФꤵƤޤ󥹥ץȤꤵƤޤ"
-"Acquire::ftp::ProxyLogin Ǥ"
+"プロキシサーバが指定されていますが、ログインスクリプトが設定されていません。"
+"Acquire::ftp::ProxyLogin が空です。"
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "󥹥ץȤΥޥ '%s' ԡб: %s"
+msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答: %s"
#: methods/ftp.cc:291
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "TYPE ԡб: %s"
+msgstr "TYPE 失敗、サーバ応答: %s"
#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
-msgstr "³ॢ"
+msgstr "接続タイムアウト"
#: methods/ftp.cc:335
msgid "Server closed the connection"
-msgstr "Ф³Ǥޤ"
+msgstr "サーバが接続を切断しました"
#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
msgid "Read error"
-msgstr "ɤ߹ߥ顼"
+msgstr "読み込みエラー"
#: methods/ftp.cc:345 methods/rsh.cc:197
msgid "A response overflowed the buffer."
-msgstr "쥹ݥ󥹤Хåե򥪡Хեޤ"
+msgstr "レスポンスがバッファをオーバフローさせました。"
#: methods/ftp.cc:362 methods/ftp.cc:374
msgid "Protocol corruption"
-msgstr "ץȥ뤬Ƥޤ"
+msgstr "プロトコルが壊れています"
#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
msgid "Write error"
-msgstr "񤭹ߥ顼"
+msgstr "書き込みエラー"
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
msgid "Could not create a socket"
-msgstr "åȤǤޤ"
+msgstr "ソケットを作成できません"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr "ǡåȤ³ǤޤǤ³ॢȤޤ"
+msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
-msgstr "ưåȤ³Ǥޤ"
+msgstr "パッシブソケットに接続できません。"
#: methods/ftp.cc:722
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo ϥꥹ˥󥰥ݡȤ뤳ȤǤޤǤ"
+msgstr "getaddrinfo はリスニングポートを取得することができませんでした"
#: methods/ftp.cc:736
msgid "Could not bind a socket"
-msgstr "åȤ bind ǤޤǤ"
+msgstr "ソケットをバインドできませんでした"
#: methods/ftp.cc:740
msgid "Could not listen on the socket"
-msgstr "åȤ listen ǤޤǤ"
+msgstr "ソケットをリスンできませんでした"
#: methods/ftp.cc:747
msgid "Could not determine the socket's name"
-msgstr "åȤ̾ǤޤǤ"
+msgstr "ソケットの名前を特定できませんでした"
#: methods/ftp.cc:779
msgid "Unable to send PORT command"
-msgstr "PORT ޥɤǤޤ"
+msgstr "PORT コマンドを送信できません"
#: methods/ftp.cc:789
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr "̤ΤΥɥ쥹եߥ %u (AF_*)"
+msgstr "未知のアドレスファミリ %u (AF_*)"
#: methods/ftp.cc:798
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT ˼Ԥޤб: %s"
+msgstr "EPRT に失敗しました。サーバ応答: %s"
#: methods/ftp.cc:818
msgid "Data socket connect timed out"
-msgstr "ǡå³ॢ"
+msgstr "データソケット接続タイムアウト"
#: methods/ftp.cc:825
msgid "Unable to accept connection"
-msgstr "³ accept Ǥޤ"
+msgstr "接続を accept できません"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "եΥϥåǤ"
+msgstr "ファイルのハッシュでの問題"
#: methods/ftp.cc:877
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "ե뤬Ǥޤ󡣥б '%s'"
+msgstr "ファイルを取得できません。サーバ応答 '%s'"
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
-msgstr "ǡåȥॢ"
+msgstr "データソケットタイムアウト"
#: methods/ftp.cc:922
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "ǡž˼Ԥޤб '%s'"
+msgstr "データ転送に失敗しました。サーバ応答 '%s'"
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
-msgstr "䤤碌"
+msgstr "問い合わせ"
#: methods/ftp.cc:1106
msgid "Unable to invoke "
-msgstr "¹ԤǤޤ"
+msgstr "呼び出せません"
#: methods/connect.cc:64
#, c-format
msgid "Connecting to %s (%s)"
-msgstr "%s (%s) ³Ƥޤ"
+msgstr "%s (%s) へ接続しています"
#: methods/connect.cc:71
#, c-format
@@ -1859,517 +1839,515 @@ 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 "%s (f=%u t=%u p=%u) Ф륽åȤǤޤ"
+msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません"
#: methods/connect.cc:86
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "%s:%s (%s) ؤ³򳫻ϤǤޤ"
+msgstr "%s:%s (%s) への接続を開始できません。"
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "%s:%s (%s) ³ǤޤǤ³ॢȤޤ"
+msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました"
#: methods/connect.cc:106
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr "%s:%s (%s) ³ǤޤǤ"
+msgstr "%s:%s (%s) へ接続できませんでした。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
#: methods/connect.cc:134 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
-msgstr "%s ³Ƥޤ"
+msgstr "%s へ接続しています"
#: methods/connect.cc:165
#, c-format
msgid "Could not resolve '%s'"
-msgstr "'%s' ǤޤǤ"
+msgstr "'%s' を解決できませんでした"
#: methods/connect.cc:171
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "'%s' Ū˲Ǥޤ"
+msgstr "'%s' が一時的に解決できません"
#: methods/connect.cc:174
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "'%s:%s' (%i) β꤬ޤ"
+msgstr "'%s:%s' (%i) の解決中に問題が起こりました"
#: methods/connect.cc:221
#, c-format
msgid "Unable to connect to %s %s:"
-msgstr "%s %s ³Ǥޤ:"
+msgstr "%s %s へ接続できません:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。"
#: methods/gpgv.cc:191
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "少なくとも 1 つの不正な署名が発見されました。"
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "å %s ǤޤǤ"
+msgstr "実行できませんでした:"
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " 署名の検証 (gnupg はインストールされていますか?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "gpgv の実行中に未知のエラーが発生"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "ʲ̥ѥå󥹥ȡ뤵ޤ:"
+msgstr "以下の署名が無効です:\n"
#: methods/gpgv.cc:244
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr ""
+msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n"
#: methods/gzip.cc:57
#, c-format
msgid "Couldn't open pipe for %s"
-msgstr "%s Фƥѥפ򳫤ޤǤ"
+msgstr "%s に対してパイプを開けませんでした"
#: methods/gzip.cc:102
#, c-format
msgid "Read error from %s process"
-msgstr "%s ץɤ߹ߥ顼"
+msgstr "%s プロセスからの読み込みエラー"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
-msgstr "إåԵǤ"
+msgstr "ヘッダの待機中です"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "%u ʸۤ 1 ԤΥإåޤ"
+msgstr "%u 文字を超える 1 行のヘッダを取得しました"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
-msgstr "ʥإåԤǤ"
+msgstr "不正なヘッダ行です"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
-msgstr "http Фʥץ饤إåƤޤ"
+msgstr "http サーバが不正なリプライヘッダを送信してきました"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "http Ф Content-Length إåƤޤ"
+msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "http Ф Content-Range إåƤޤ"
+msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
-msgstr "http ФΥ󥸥ݡȤƤޤ"
+msgstr "http サーバのレンジサポートが壊れています"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
-msgstr "եեޥåȤǤ"
+msgstr "不明な日付フォーマットです"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
-msgstr "select ˼Ԥޤ"
+msgstr "select に失敗しました"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
-msgstr "³ॢ"
+msgstr "接続タイムアウト"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
-msgstr "ϥեؤν񤭹ߤǥ顼ȯޤ"
+msgstr "出力ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
-msgstr "եؤν񤭹ߤǥ顼ȯޤ"
+msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
-msgstr "եؤν񤭹ߤǥ顼ȯޤ"
+msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
-msgstr "⡼¦³ƥФɤ߹ߤ˼Ԥޤ"
+msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
-msgstr "Фɤ߹ߤ˼Ԥޤ"
+msgstr "サーバからの読み込みに失敗しました"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
-msgstr "ʥإåǤ"
+msgstr "不正なヘッダです"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
-msgstr "³"
+msgstr "接続失敗"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
-msgstr "顼"
+msgstr "内部エラー"
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
-msgstr "Υե mmap Ǥޤ"
+msgstr "空のファイルを mmap できません"
#: apt-pkg/contrib/mmap.cc:87
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr "%lu ХȤ mmap ǤޤǤ"
+msgstr "%lu バイトの mmap ができませんでした"
#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
-msgstr "򤵤줿 %s Ĥޤ"
+msgstr "選択された %s が見つかりません"
#: apt-pkg/contrib/configuration.cc:436
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "ǤʤάǤ: '%c'"
+msgstr "理解できない省略形式です: '%c'"
#: apt-pkg/contrib/configuration.cc:494
#, c-format
msgid "Opening configuration file %s"
-msgstr "ե %s 򥪡ץǤޤǤ"
+msgstr "設定ファイル %s をオープンできませんでした"
#: apt-pkg/contrib/configuration.cc:512
#, c-format
msgid "Line %d too long (max %d)"
-msgstr "%d ܤĹ᤮ޤ ( %d)"
+msgstr "%d 行目が長すぎます (最大 %d)"
#: apt-pkg/contrib/configuration.cc:608
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "ʸˡ顼 %s:%u: ֥å̾ʤǻϤޤäƤޤ"
+msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
#: apt-pkg/contrib/configuration.cc:627
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "ʸˡ顼 %s:%u: ʥǤ"
+msgstr "文法エラー %s:%u: 不正なタグです"
#: apt-pkg/contrib/configuration.cc:644
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "ʸˡ顼 %s:%u: ͤθ;ʬʥߤäƤޤ"
+msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています"
#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "ʸˡ顼 %s:%u: ̿ϥȥåץ٥ǤΤ߼¹ԤǤޤ"
+msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます"
#: apt-pkg/contrib/configuration.cc:691
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "ʸˡ顼 %s:%u: 󥯥롼ɤΥͥȤ¿᤮ޤ"
+msgstr "文法エラー %s:%u: インクルードのネストが多すぎます"
#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr "ʸˡ顼 %s:%u: 饤󥯥롼ɤƤޤ"
+msgstr "文法エラー %s:%u: ここからインクルードされています"
#: apt-pkg/contrib/configuration.cc:704
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "ʸˡ顼 %s:%u: ̤б̿ '%s'"
+msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "ʸˡ顼 %s:%u: եκǸ;פʥߤޤ"
+msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
#: apt-pkg/contrib/progress.cc:154
#, c-format
msgid "%c%s... Error!"
-msgstr "%c%s... 顼!"
+msgstr "%c%s... エラー!"
#: apt-pkg/contrib/progress.cc:156
#, c-format
msgid "%c%s... Done"
-msgstr "%c%s... λ"
+msgstr "%c%s... 完了"
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "ޥɥ饤󥪥ץ '%c' [%s ] Ǥ"
+msgstr "コマンドラインオプション '%c' [%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 "ޥɥ饤󥪥ץ %s Ǥޤ"
+msgstr "コマンドラインオプション %s を理解できません"
#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "ޥɥ饤󥪥ץ %s boolean ǤϤޤ"
+msgstr "コマンドラインオプション %s は boolean ではありません"
#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
-msgstr "ץ %s ˤϰɬפǤ"
+msgstr "オプション %s には引数が必要です。"
#: 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 "ץ %s: ܤˤ =<> ꤹɬפޤ"
+msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。"
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "ץ %s ˤ '%s' ǤϤʤΰɬפǤ"
+msgstr "オプション %s には '%s' ではなく整数の引数が必要です"
#: apt-pkg/contrib/cmndline.cc:268
#, c-format
msgid "Option '%s' is too long"
-msgstr "ץ '%s' Ĺޤ"
+msgstr "オプション '%s' は長すぎます"
#: apt-pkg/contrib/cmndline.cc:301
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr "%s ᤹뤳ȤǤޤtrue false Ƥ"
+msgstr "%s を解釈することができません。true か false を試してください。"
#: apt-pkg/contrib/cmndline.cc:351
#, c-format
msgid "Invalid operation %s"
-msgstr " %s"
+msgstr "不正な操作 %s"
#: apt-pkg/contrib/cdromutl.cc:55
#, c-format
msgid "Unable to stat the mount point %s"
-msgstr "ޥȥݥ %s stat Ǥޤ"
+msgstr "マウントポイント %s の状態を取得できません"
#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
-msgstr "%s ѹ뤳ȤǤޤ"
+msgstr "%s へ変更することができません"
#: apt-pkg/contrib/cdromutl.cc:190
msgid "Failed to stat the cdrom"
-msgstr "cdrom stat ˼Ԥޤ"
+msgstr "cdrom の状態を取得するのに失敗しました"
#: apt-pkg/contrib/fileutl.cc:82
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "ɤ߹ѤΥåե %s ˥åϻѤޤ"
+msgstr "読み込み専用のロックファイル %s にロックは使用しません"
#: apt-pkg/contrib/fileutl.cc:87
#, c-format
msgid "Could not open lock file %s"
-msgstr "åե %s 򥪡ץǤޤ"
+msgstr "ロックファイル %s をオープンできません"
#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr "nfs ޥȤ줿åե %s ˤϥåѤޤ"
+msgstr "nfs マウントされたロックファイル %s にはロックを使用しません"
#: apt-pkg/contrib/fileutl.cc:109
#, c-format
msgid "Could not get lock %s"
-msgstr "å %s ǤޤǤ"
+msgstr "ロック %s が取得できませんでした"
#: apt-pkg/contrib/fileutl.cc:377
#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr "%s ԤޤˤϤޤǤ"
+msgstr "%s を待ちましたが、そこにはありませんでした"
#: apt-pkg/contrib/fileutl.cc:387
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr "ҥץ %s ơȿȤޤ"
+msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr "ҥץ %s 顼 (%u) ֤ޤ"
+msgstr "子プロセス %s がエラーコード (%u) を返しました"
#: apt-pkg/contrib/fileutl.cc:392
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr "ҥץ %s ͽλޤ"
+msgstr "子プロセス %s が予期せず終了しました"
#: apt-pkg/contrib/fileutl.cc:436
#, c-format
msgid "Could not open file %s"
-msgstr "ե %s 򥪡ץǤޤǤ"
+msgstr "ファイル %s をオープンできませんでした"
#: apt-pkg/contrib/fileutl.cc:492
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "ɤ߹ߤ %lu ĤäƤϤǤĤäƤޤ"
+msgstr "読み込みが %lu 残っているはずですが、何も残っていません"
#: apt-pkg/contrib/fileutl.cc:522
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr " %lu 񤭹ɬפޤ񤭹ळȤǤޤǤ"
+msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした"
#: apt-pkg/contrib/fileutl.cc:597
msgid "Problem closing the file"
-msgstr "եΥ꤬ȯޤ"
+msgstr "ファイルのクローズ中に問題が発生しました"
#: apt-pkg/contrib/fileutl.cc:603
msgid "Problem unlinking the file"
-msgstr "եκ꤬ȯޤ"
+msgstr "ファイルの削除中に問題が発生しました"
#: apt-pkg/contrib/fileutl.cc:614
msgid "Problem syncing the file"
-msgstr "ե sync ꤬ȯޤ"
+msgstr "ファイルの同期中に問題が発生しました"
#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
-msgstr "Υѥåå"
+msgstr "空のパッケージキャッシュ"
#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
-msgstr "ѥååե뤬Ƥޤ"
+msgstr "パッケージキャッシュファイルが壊れています"
#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
-msgstr "ΥѥååեϸߴʤСǤ"
+msgstr "このパッケージキャッシュファイルは互換性がないバージョンです"
#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr " APT ϥС˥󥰥ƥ '%s' 򥵥ݡȤƤޤ"
+msgstr "この APT はバージョニングシステム '%s' をサポートしていません"
#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
-msgstr "ѥåå夬ۤʤ륢ƥѤ˹ۤƤޤ"
+msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています"
#: apt-pkg/pkgcache.cc:218
msgid "Depends"
-msgstr "¸"
+msgstr "依存"
#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
-msgstr "԰¸"
+msgstr "先行依存"
#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
-msgstr ""
+msgstr "提案"
#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
-msgstr "侩"
+msgstr "推奨"
#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
-msgstr ""
+msgstr "競合"
#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
-msgstr "ִ"
+msgstr "置換"
#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
-msgstr "ѻ"
+msgstr "廃止"
#: apt-pkg/pkgcache.cc:231
msgid "important"
-msgstr ""
+msgstr "重要"
#: apt-pkg/pkgcache.cc:231
msgid "required"
-msgstr "׵"
+msgstr "要求"
#: apt-pkg/pkgcache.cc:231
msgid "standard"
-msgstr "ɸ"
+msgstr "標準"
#: apt-pkg/pkgcache.cc:232
msgid "optional"
-msgstr "Ǥ"
+msgstr "任意"
#: apt-pkg/pkgcache.cc:232
msgid "extra"
-msgstr ""
+msgstr "特別"
#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
msgid "Building dependency tree"
-msgstr "¸طĥ꡼Ƥޤ"
+msgstr "依存関係ツリーを作成しています"
#: apt-pkg/depcache.cc:61
msgid "Candidate versions"
-msgstr "С"
+msgstr "候補バージョン"
#: apt-pkg/depcache.cc:90
msgid "Dependency generation"
-msgstr "¸ط"
+msgstr "依存関係の生成"
#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr "ѥåե %s ᤹뤳ȤǤޤ (1)"
+msgstr "パッケージファイル %s を解釈することができません (1)"
#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr "ѥåե %s ᤹뤳ȤǤޤ (2)"
+msgstr "パッケージファイル %s を解釈することができません (2)"
#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr "ꥹ %2$s %1$lu ܤǤ (URI)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "ꥹ %2$s %1$lu ܤǤ (dist)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "ꥹ %2$s %1$lu ܤǤ (URI parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "ꥹ %2$s %1$lu ܤǤ (absolute dist)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "ꥹ %2$s %1$lu ܤǤ (dist parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
#: apt-pkg/sourcelist.cc:203
#, c-format
msgid "Opening %s"
-msgstr "%s 򥪡ץ󤷤Ƥޤ"
+msgstr "%s をオープンしています"
#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
-msgstr "ꥹ %2$s %1$u ܤĹ᤮ޤ"
+msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr "ꥹ %2$s %1$u ܤǤ (type)"
+msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
#: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ꥹ %3$s %2$u Ԥˤ륿 '%1$s' Ǥ"
+msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "ꥹ %2$s %1$u ܤǤ (vendor id)"
+msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)"
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2378,235 +2356,236 @@ msgid ""
"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 ""
-"Υ󥹥ȡϡ/԰¸Υ롼פǡŪ˽פԲķѥ"
-" %s ޤ¿ξ꤬븶Ȥʤޤ"
-"Ԥʤ顢APT::Force-LoopBreak ץͭˤƤ"
+"このインストールは、競合/先行依存のループが原因で、一時的に重要な不可欠パッ"
+"ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に"
+"これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。"
#: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr "ǥåեΥ '%s' ϥݡȤƤޤ"
+msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
#: apt-pkg/algorithms.cc:241
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-"ѥå %s ƥ󥹥ȡ뤹ɬפޤΤΥ֤"
-"Ĥ뤳ȤǤޤǤ"
+"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
+"つけることができませんでした。"
#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"顼pkgProblemResolver::Resolve ߤޤ餯ѹػߥѥå"
-"Ǥ"
+"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
+"ジが原因です。"
#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
-msgstr "褹뤳ȤǤޤ󡣲줿ѹػߥѥåޤ"
+msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
#: apt-pkg/acquire.cc:62
#, c-format
msgid "Lists directory %spartial is missing."
-msgstr "ꥹȥǥ쥯ȥ %spartial Ĥޤ"
+msgstr "リストディレクトリ %spartial が見つかりません。"
#: apt-pkg/acquire.cc:66
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr "֥ǥ쥯ȥ %spartial Ĥޤ"
+msgstr "アーカイブディレクトリ %spartial が見つかりません。"
#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "ファイルをダウンロードしています %li/%li (残り %s)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
-msgstr "᥽åɥɥ饤 %s Ĥޤ"
+msgstr "メソッドドライバ %s が見つかりません。"
#: apt-pkg/acquire-worker.cc:162
#, c-format
msgid "Method %s did not start correctly"
-msgstr "᥽å %s ˳ϤޤǤ"
+msgstr "メソッド %s が正常に開始しませんでした"
#: 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 ""
-"ǥѹ: \n"
-" '%s'\n"
-"ȥ٥դǥɥ饤 '%s' enter 򲡤Ƥ\n"
+msgstr "'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してください。"
#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "ѥå󥰥ƥ '%s' ϥݡȤƤޤ"
+msgstr "パッケージングシステム '%s' はサポートされていません"
#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
-msgstr "ŬڤʥѥåƥॿפǤޤ"
+msgstr "適切なパッケージシステムタイプを特定できません"
#: apt-pkg/clean.cc:61
#, c-format
msgid "Unable to stat %s."
-msgstr "%s stat Ǥޤ"
+msgstr "%s の状態を取得できません。"
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "sources.list '' URI ꤹɬפޤ"
+msgstr "sources.list に 'ソース' URI を指定する必要があります"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-"ѥåꥹȤޤϥơեޤϥץ󤹤뤳ȤǤ"
-""
+"パッケージリストまたはステータスファイルを解釈またはオープンすることができま"
+"せん。"
#: apt-pkg/cachefile.cc:77
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-"褹뤿ˤ apt-get update ¹Ԥɬפ뤫⤷"
-""
+"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
+"せん"
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-"ʥ쥳ɤ preferences ե¸ߤޤѥåإåޤ"
-""
+"不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ"
+"ん"
#: apt-pkg/policy.cc:291
#, c-format
msgid "Did not understand pin type %s"
-msgstr "pin %s ǤޤǤ"
+msgstr "pin タイプ %s が理解できませんでした"
#: apt-pkg/policy.cc:299
msgid "No priority (or zero) specified for pin"
-msgstr "pin ͥ (ޤ 0) ꤵƤޤ"
+msgstr "pin で優先度 (または 0) が指定されていません"
#: apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
-msgstr "åߴʥС˥󥰥ƥबޤ"
+msgstr "キャッシュに非互換なバージョニングシステムがあります"
#: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "%s ˥顼ȯޤ (NewPackage)"
+msgstr "%s を処理中にエラーが発生しました (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "%s ˥顼ȯޤ (UsePackage1)"
+msgstr "%s を処理中にエラーが発生しました (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "%s ˥顼ȯޤ (UsePackage2)"
+msgstr "%s を処理中にエラーが発生しました (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "%s ˥顼ȯޤ (NewFileVer1)"
+msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "%s ˥顼ȯޤ (NewVersion1)"
+msgstr "%s を処理中にエラーが発生しました (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "%s ˥顼ȯޤ (UsePackage3)"
+msgstr "%s を処理中にエラーが発生しました (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "%s ˥顼ȯޤ (NewVersion2)"
+msgstr "%s を処理中にエラーが発生しました (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr " APT бƤʾοΥѥåꤵޤ"
+msgstr "この APT が対応している以上の数のパッケージが指定されました。"
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr " APT бƤʾοΥС׵ᤵޤ"
+msgstr "この APT が対応している以上の数のバージョンが要求されました。"
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr " APT бƤʾοΰ¸طȯޤ"
+msgstr "この APT が対応している以上の数の依存関係が発生しました。"
#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "%s ˥顼ȯޤ (FindPkg)"
+msgstr "%s を処理中にエラーが発生しました (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "%s ˥顼ȯޤ (CollectFileProvides)"
+msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ѥå %s %s ե¸ν˸ĤޤǤ"
+msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr "ѥåꥹ %s stat Ǥޤ"
+msgstr "ソースパッケージリスト %s の状態を取得できません"
#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
-msgstr "ե󶡾Ƥޤ"
+msgstr "ファイル提供情報を収集しています"
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
-msgstr "å¸ IO 顼ȯޤ"
+msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr "͡˼Ԥޤ%s (%s -> %s)"
+msgstr "名前の変更に失敗しました。%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
-msgstr "MD5Sum Ŭ礷ޤ"
+msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
-"ǽɬפޤ (¸ߤʤƥΤ)"
+"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
+"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
-"ǽɬפޤ"
+"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
+"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-"ѥåǥåե뤬Ƥޤѥå %s Filename: "
-"եɤޤ"
+"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
+"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
-msgstr "Ŭ礷ޤ"
+msgstr "サイズが適合しません"
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr "٥֥å %s ϥե󥬡ץȤޤǤޤ"
+msgstr "ベンダブロック %s はフィンガープリントを含んでいません"
#: apt-pkg/cdrom.cc:507
#, c-format
@@ -2614,50 +2593,50 @@ msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-"CD-ROM ޥȥݥ %s Ѥޤ\n"
-"CD-ROM ޥȤƤޤ\n"
+"CD-ROM マウントポイント %s を使用します\n"
+"CD-ROM をマウントしています\n"
#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
-msgstr "ǧƤޤ.. "
+msgstr "確認しています.. "
#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
-msgstr "Ǽ줿٥: %s \n"
+msgstr "格納されたラベル: %s \n"
#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr "CD-ROM ޥȥݥ %s Ѥޤ\n"
+msgstr "CD-ROM マウントポイント %s を使用します\n"
#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM 򥢥ޥȤƤޤ\n"
+msgstr "CD-ROM をアンマウントしています\n"
#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
-msgstr "ǥԤäƤޤ...\n"
+msgstr "ディスクを待っています ...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
-msgstr "CD-ROM ޥȤƤޤ...\n"
+msgstr "CD-ROM をマウントしています ...\n"
#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
-msgstr "ǥΥǥåեƤޤ..\n"
+msgstr "ディスクのインデックスファイルを走査しています ..\n"
#: apt-pkg/cdrom.cc:647
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-"%i Υѥåǥå%i Υǥå%i ν̾򸫤Ĥޤ"
-"\n"
+"%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし"
+"た\n"
#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
-msgstr "ͭ̾ǤϤޤ󡣺ƻԤƤ\n"
+msgstr "これは有効な名前ではありません。再試行してください。\n"
#: apt-pkg/cdrom.cc:726
#, c-format
@@ -2665,100 +2644,97 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-"ΥǥϰʲΤ褦˸ƤФޤ: \n"
+"このディスクは以下のように呼ばれます: \n"
"'%s'\n"
#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
-msgstr "ѥåꥹȤ򥳥ԡƤޤ..."
+msgstr "パッケージリストをコピーしています ..."
#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
-msgstr "ꥹȤ񤭹Ǥޤ\n"
+msgstr "新しいソースリストを書き込んでいます\n"
#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
-msgstr "ΥǥΥꥹȤΥȥ:\n"
+msgstr "このディスクのソースリストのエントリ:\n"
#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
-msgstr "CD-ROM 򥢥ޥȤƤޤ..."
+msgstr "CD-ROM をアンマウントしています ..."
#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
-msgstr "%i 쥳ɤ񤭹ߤޤ\n"
+msgstr "%i レコードを書き込みました。\n"
#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i 쥳ɤ񤭹ߤޤ%i ĤΥե뤬¸ߤޤ\n"
+msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i 쥳ɤ񤭹ߤޤ%i ĤŬ礷ʤե뤬ޤ\n"
+msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-"%i 쥳ɤ񤭹ߤޤ%i ĤΥե뤬Ĥ餺%i ĤŬ礷ʤ"
-"ե뤬ޤ\n"
+"%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない"
+"ファイルがあります。\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "%s 򥪡ץ󤷤Ƥޤ"
+msgstr "%s を準備しています"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "%s 򥪡ץ󤷤Ƥޤ"
+msgstr "%s を展開しています"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "ե %s 򥪡ץǤޤǤ"
+msgstr "%s の設定を準備しています"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "%s ³Ƥޤ"
+msgstr "%s を設定しています"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " 󥹥ȡ뤵ƤС: "
+msgstr "%s をインストールしました"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "%s の削除を準備しています"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "%s 򥪡ץ󤷤Ƥޤ"
+msgstr "%s を削除しています"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "侩"
+msgstr "%s を削除しました"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "設定 %s の削除を準備しています"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "設定 %s を削除しました"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
-msgstr "³ޤ"
-
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "ꥹ %3$s %2$u Ԥʥ٥ ID '%1$s' ޤ"
+msgstr "途中で接続がクローズされました"
diff --git a/po/ko.po b/po/ko.po
index fa9ce0107..3473f9de7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-02-10 21:56+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <cwryu@debian.org>\n"
@@ -517,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "%s의 정보를 읽는 데 실패했습니다"
@@ -1090,7 +1090,7 @@ msgstr "%s의 소스 꾸러미를 찾을 수 없습니다"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
#: cmdline/apt-get.cc:1983
@@ -1674,12 +1674,12 @@ msgstr "파일이 없습니다"
msgid "File not found"
msgstr "파일이 없습니다"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "파일 정보를 읽는 데 실패했습니다"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "파일 변경 시각을 설정하는 데 실패했습니다"
@@ -1807,7 +1807,7 @@ msgstr "데이터 소켓 연결 시간 초과"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
@@ -1939,76 +1939,76 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
msgid "Read error from %s process"
msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "헤더를 기다리는 중입니다"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "헤더 줄이 잘못되었습니다"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "서버에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "내부 오류"
@@ -2550,11 +2550,15 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2563,7 +2567,7 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2572,14 +2576,14 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
diff --git a/po/nb.po b/po/nb.po
index 168ee23d6..764d60d01 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-02-09 10:45+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokml <i18n-nb@lister.ping.ui.no>\n"
@@ -535,7 +535,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa p %s B er ndd.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Klarte ikke f statusen p %s"
@@ -1106,7 +1106,7 @@ msgstr "Klarer ikke finne en kildekodepakke for %s"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
#: cmdline/apt-get.cc:1983
@@ -1695,12 +1695,12 @@ msgstr "Fant ikke fila"
msgid "File not found"
msgstr "Fant ikke fila"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Klarte ikke f status"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Klarte ikke sette endringstidspunkt"
@@ -1828,7 +1828,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke godta tilkoblingen"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1960,76 +1960,76 @@ msgstr "Klarte ikke pne rr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fra %s-prosessen"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Venter p hoder"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fikk en enkel hodelinje over %u tegn"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "delagt hodelinje"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har delagt sttte for omrde"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsavbrudd p forbindelsen"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "delagte hodedata"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Intern feil"
@@ -2573,11 +2573,15 @@ msgstr "IO-feil ved lagring av kildekode-lager"
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2586,7 +2590,7 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2595,13 +2599,13 @@ msgstr ""
"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Feil strrelse"
diff --git a/po/nl.po b/po/nl.po
index 8fcffe797..758321e4a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-02-10 17:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -525,7 +525,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Ontlinklimiet van %sB is bereikt.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Status opvragen van %s is mislukt"
@@ -1101,7 +1101,7 @@ msgstr "Kan geen bronpakket vinden voor %s"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
#: cmdline/apt-get.cc:1983
@@ -1703,12 +1703,12 @@ msgstr "Bestand niet gevonden"
msgid "File not found"
msgstr "Bestand niet gevonden"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Status opvragen is mislukt"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -1836,7 +1836,7 @@ msgstr "Datasocket verbinding is verlopen"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -1968,79 +1968,79 @@ msgstr "Kon geen pijp openen voor %s"
msgid "Read error from %s process"
msgstr "Leesfout door proces %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Wachtend op de kopteksten"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Interne fout"
@@ -2597,11 +2597,15 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "hernoeming is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2610,7 +2614,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2619,7 +2623,7 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2627,7 +2631,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
diff --git a/po/nn.po b/po/nn.po
index 4f9ecb637..d97e7ab1f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -519,7 +519,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa p %sB er ndd.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Klarte ikkje f status til %s"
@@ -1093,7 +1093,7 @@ msgstr "Finn ingen kjeldepakke for %s"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
#: cmdline/apt-get.cc:1983
@@ -1678,12 +1678,12 @@ msgstr "Fann ikkje fila"
msgid "File not found"
msgstr "Fann ikkje fila"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Klarte ikkje f status"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Klarte ikkje setja endringstidspunkt"
@@ -1811,7 +1811,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1943,76 +1943,76 @@ msgstr "Klarte ikkje opna ryr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fr %s-prosessen"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Ventar p hovud"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fekk ei enkel hovudlinje over %u teikn"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "ydelagd hovudlinje"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Intern feil"
@@ -2556,11 +2556,15 @@ msgstr "IU-feil ved lagring av kjeldelager"
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2569,7 +2573,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2577,14 +2581,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Feil storleik"
diff --git a/po/pl.po b/po/pl.po
index 766046b67..7788291fd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,13 +1,13 @@
# Advanced Package Transfer - APT message translation catalog
# Polish translation by:
# Marcin Owsiany <porridge@debian.org>, 2002, 2003, 2004.
-# Bartosz Fenski <fenio@debian.org>, 2005
+# Bartosz Fenski <fenio@debian.org>, 2005, 2006
msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-02-11 11:47+0100\n"
+"POT-Creation-Date: 2006-01-20 14:06+0100\n"
+"PO-Revision-Date: 2006-01-23 15:32+0100\n"
"Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
"Language-Team: Polish <pddp@debian.linux.org.pl>\n"
"MIME-Version: 1.0\n"
@@ -232,19 +232,15 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Prosz wprowadzi nazw dla tej pyty, np 'Debian 2.1r1 Disk 1'"
#: cmdline/apt-cdrom.cc:93
-#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Zmiana nonika: Prosz woy dysk oznaczony\n"
-" '%s'\n"
-"do napdu '%s' i nacisn enter\n"
+msgstr "Prosz woy dysk do napdu i nacisn enter"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Powtrz ten proces dla reszty pyt."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -338,10 +334,9 @@ msgstr "Bd przy zapisywaniu nagwka do pliku zawartoci"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
msgid "Error processing contents %s"
-msgstr "Bd przy przetwarzaniu zawartoci %s"
+msgstr "Bd podczas przetwarzania zawartoci %s"
#: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -522,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Osignito ograniczenie odczania %sB.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Nie udao si wykona operacji stat na %s"
@@ -709,12 +704,11 @@ msgid "%s (due to %s) "
msgstr "%s (z powodu %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 ""
-"UWAGA: Zostan usunite nastpujce istotne pakiety\n"
+"UWAGA: Zostan usunite nastpujce istotne pakiety.\n"
"Nie powinno si tego robi, chyba e dokadnie wiesz, co robisz!"
#: cmdline/apt-get.cc:577
@@ -776,7 +770,7 @@ msgstr "UWAGA: Nastpujce pakiety nie mog zosta zweryfikowane!"
#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Ostrzeenie uwierzytelniania zignorowano.\n"
#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
@@ -792,16 +786,15 @@ msgstr "Byy problemy, a uyto -y bez --force-yes"
#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Bd wewntrzny, InstallPackages uyto z zepsutymi pakietami!"
#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone."
#: cmdline/apt-get.cc:775
-#, fuzzy
msgid "Internal error, Ordering didn't finish"
-msgstr "Bd wewntrzny przy dodawaniu objazdu"
+msgstr "Bd wewntrzny, sortowanie niezakoczone"
#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
@@ -814,7 +807,7 @@ msgstr "Nie udao si odczyta list rde."
#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "Dziwne.. rozmiary si nie zgadzaj, zgo pod apt@packages.debian.org"
#: cmdline/apt-get.cc:821
#, c-format
@@ -837,9 +830,9 @@ msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\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 "W %s nie ma wystarczajcej iloci wolnego miejsca"
+msgstr "Nie udao si ustali iloci wolnego miejsca w %s"
#: cmdline/apt-get.cc:849
#, c-format
@@ -855,13 +848,13 @@ msgid "Yes, do as I say!"
msgstr "Tak, rb jak mwi!"
#: 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 ""
-"Zaraz zrobisz co potencjalnie szkodliwego\n"
+"Zaraz zrobisz co potencjalnie szkodliwego.\n"
"Aby kontynuowa wpisz zdanie '%s'\n"
" ?] "
@@ -1031,9 +1024,9 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
"Nie udao si zainstalowa niektrych pakietw. Moe to oznacza,\n"
-"e zadae/a niemoliwej sytuacji lub uywasz dystrybucji\n"
-"niestabilnej, w ktrej niektre pakiety nie zostay jeszcze utworzone\n"
-"lub przeniesione z katalogu Incoming (\"Przychodzce\")."
+"e zadano niemoliwej sytuacji lub uywasz dystrybucji niestabilnej,\n"
+"w ktrej niektre pakiety nie zostay jeszcze utworzone lub przeniesione\n"
+"z katalogu Incoming (\"Przychodzce\")."
#: cmdline/apt-get.cc:1578
msgid ""
@@ -1041,7 +1034,7 @@ msgid ""
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"Poniewa zadae/a tylko jednej operacji, jest bardzo prawdopodobne, e\n"
+"Poniewa zadno tylko jednej operacji, jest bardzo prawdopodobne, e\n"
"danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n"
"bd."
@@ -1078,9 +1071,8 @@ msgid "Done"
msgstr "Gotowe"
#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
-#, fuzzy
msgid "Internal error, problem resolver broke stuff"
-msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo"
+msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo"
#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
@@ -1094,9 +1086,9 @@ msgid "Unable to find a source package for %s"
msgstr "Nie udao si odnale rda dla pakietu %s"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n"
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Pomijanie ju pobranego pliku '%s'\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1135,7 +1127,7 @@ msgstr "Polecenie rozpakowania '%s' zawiodo.\n"
#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Sprawd czy pakiet 'dpkg-dev' jest zainstalowany.\n"
#: cmdline/apt-get.cc:2086
#, c-format
@@ -1459,7 +1451,7 @@ msgid "Duplicate conf file %s/%s"
msgstr "Zduplikowany plik konfiguracyjny %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 "Nie udao si zapisa pliku %s"
@@ -1679,20 +1671,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nie udao si odmontowa CD-ROM-u w %s, by moe wci jest uywany."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Nie odnaleziono pliku"
+msgstr "Nie odnaleziono dysku."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Nie odnaleziono pliku"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Nie udao si wykona operacji stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Nie udao si ustawi czasu modyfikacji"
@@ -1821,7 +1812,7 @@ msgstr "Przekroczony czas poczenia gniazda danych"
msgid "Unable to accept connection"
msgstr "Nie udao si przyj poczenia"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie udao si obliczy skrtu pliku"
@@ -1907,41 +1898,43 @@ msgstr "Nie udao si poczy z %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Lista argumentw Acquire::gpgv::Options zbyt duga. Wychodzimy."
#: methods/gpgv.cc:191
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Bd wewntrzny: Prawidowa sygnatura, ale nie nie udao si ustali "
+"jejodcisku?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Napotkano przynajmniej jedn nieprawidow sygnatur."
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "Nie udao si uzyska blokady %s"
+msgstr "Nie udao si uruchomi "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " by zweryfikowa sygnatur (czy gnupg jest zainstalowane?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Nieznany bd podczas uruchamiania gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:"
+msgstr "Nastpujce sygnatury byy bdne:\n"
#: methods/gpgv.cc:244
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Nastpujce sygnatury nie mogy zosta zweryfikowane z powodu braku klucza "
+"publicznego:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1953,76 +1946,76 @@ msgstr "Nie udao si otworzy potoku dla %s"
msgid "Read error from %s process"
msgstr "Bd odczytu z procesu %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Oczekiwanie na nagwki"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Otrzymano pojedyncz lini nagwka o dugoci ponad %u znakw"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Nieprawidowa linia nagwka"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Length"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Range"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Operacja select nie powioda si"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Przekroczenie czasu poczenia"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Bd przy pisaniu do pliku wyjciowego"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Bd czytania z serwera"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Bdne dane nagwka"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Poczenie nie udao si"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Bd wewntrzny"
@@ -2365,9 +2358,9 @@ msgid "Malformed line %u in source list %s (type)"
msgstr "Nieprawidowa linia %u w licie rde %s (typ)"
#: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ '%s' jest nieznany - linia %u listy rde %s"
+msgstr "Typ '%s' jest nieznany w linii %u listy rde %s"
#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
@@ -2408,7 +2401,7 @@ msgstr ""
#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Nie udao si naprawi problemw, zatrzymae/a uszkodzone pakiety."
+msgstr "Nie udao si naprawi problemw, zatrzymano uszkodzone pakiety."
#: apt-pkg/acquire.cc:62
#, c-format
@@ -2423,7 +2416,7 @@ msgstr "Brakuje katalogu archiww %spartial."
#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Pobieranie pliku %li z %li (%s pozostao)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2436,12 +2429,9 @@ msgid "Method %s did not start correctly"
msgstr "Metoda %s nie uruchomia si poprawnie."
#: 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 ""
-"Zmiana nonika: Prosz woy dysk oznaczony\n"
-" '%s'\n"
-"do napdu '%s' i nacisn enter\n"
+msgstr "W do napdu '%s' dysk o nazwie: '%s' i nacinij enter."
#: apt-pkg/init.cc:120
#, c-format
@@ -2489,69 +2479,67 @@ msgstr "Magazyn podrczny ma niezgodny system wersji"
#: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Wystpi bd przy przetwarzaniu %s (NewPackage)"
+msgstr "Wystpi bd podczas przetwarzania %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Wystpi bd przy przetwarzaniu %s (UsePackage1)"
+msgstr "Wystpi bd podczas przetwarzania %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Wystpi bd przy przetwarzaniu %s (UsePackage2)"
+msgstr "Wystpi bd podczas przetwarzania %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Wystpi bd przy przetwarzaniu %s (NewFileVer1)"
+msgstr "Wystpi bd podczas przetwarzania %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Wystpi bd przy przetwarzaniu %s (NewVersion1)"
+msgstr "Wystpi bd podczas przetwarzania %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Wystpi bd przy przetwarzaniu %s (UsePackage3)"
+msgstr "Wystpi bd podczas przetwarzania %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Wystpi bd przy przetwarzaniu %s (NewVersion2)"
+msgstr "Wystpi bd podczas przetwarzania %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-"Och, przekroczye/a liczb pakietw, ktr ten APT jest w stanie obsuy."
+"Och, przekroczono liczb pakietw, ktr ten APT jest w stanie obsuy."
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Och, przekroczye/a liczb wersji, ktr ten APT jest w stanie obsuy."
+msgstr "Och, przekroczono liczb wersji, ktr ten APT jest w stanie obsuy."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-"Och, przekroczye/a liczb zalenoci, ktr ten APT jest w stanie "
-"obsuy."
+"Och, przekroczono liczb zalenoci, ktr ten APT jest w stanie obsuy."
#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Wystpi bd przy przetwarzaniu %s (FindPkg)"
+msgstr "Wystpi bd podczas przetwarzania %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Wystpi bd przy przetwarzaniu %s (CollectFileProvides)"
+msgstr "Wystpi bd podczas przetwarzania %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-"Pakiet %s %s nie zosta odnaleziony przy przetwarzaniu zalenoci plikw"
+"Pakiet %s %s nie zosta odnaleziony podczas przetwarzania zalenoci plikw"
#: apt-pkg/pkgcachegen.cc:574
#, c-format
@@ -2571,11 +2559,15 @@ msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde"
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udao si zmieni nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Bdna suma MD5"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Dla nastpujcego identyfikatora klucza brakuje klucza publicznego:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2584,7 +2576,7 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2593,14 +2585,14 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Bdny rozmiar"
@@ -2653,7 +2645,8 @@ msgstr "Skawnowanie pyty w poszukiwaniu plikw indeksu..\n"
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-"Znaleziono %i indeksw pakietw, %i indeksw rdowych i %i sygnatur\n"
+"Znaleziono %i indeksw pakietw, %i indeksw rdowych, %i indeksw "
+"tumacze i %i sygnatur\n"
#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
@@ -2705,55 +2698,74 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapisano %i rekordw z %i brakujcymi plikami i %i niepasujcymi\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Otwieranie %s"
+msgstr "Przygotowanie %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Otwieranie %s"
+msgstr "Rozpakowywanie %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Otwieranie pliku konfiguracyjnego %s"
+msgstr "Przygotowanie do konfiguracji %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "czenie z %s"
+msgstr "Konfigurowanie %s"
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Zainstalowana: "
+msgstr " Zainstalowany %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Przygotowanie do usunicia %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Otwieranie %s"
+msgstr "Usuwanie %s"
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Poleca"
+msgstr "Usunito %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "Przygotowanie do usunicia %s wraz z konfiguracj"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Usunito %s wraz z konfiguracj"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Poczenie zostao zamknite przedwczenie"
+
+#~ msgid "Total Distinct Descriptions: "
+#~ msgstr "W sumie rnych opisw: "
+
+#~ msgid "Total Desc/File relations: "
+#~ msgstr "W sumie zalenoci opis/plik: "
+
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc1)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc2)"
+
+#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#~ msgstr ""
+#~ "Och, przekroczono liczb opisw, ktr ten APT jest w stanie obsuy."
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nie udao si naoy atki na plik"
diff --git a/po/pt.po b/po/pt.po
index 770803c52..98150e94d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\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"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -517,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Falha ao executar stat %s"
@@ -1092,7 +1092,7 @@ msgstr "Impossível encontrar um pacote de código fonte para %s"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr ""
"Saltando a descompactação de pacote código fonte já descompactado em %s\n"
@@ -1686,12 +1686,12 @@ msgstr "Arquivo não encontrado"
msgid "File not found"
msgstr "Arquivo não encontrado"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Falha ao executar stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Falha ao definir hora de modificação"
@@ -1819,7 +1819,7 @@ msgstr "Ligação de socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do ficheiro"
@@ -1951,76 +1951,76 @@ msgstr "Não foi possível abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor http enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor http enviou um cabeçalho Conten-Length inválido"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor http enviou um cabeçalho Conten-Range inválido"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range errado"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select falhou."
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "A ligação expirou"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erro gravando para ficheiro de saída"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erro gravando para ficheiro"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erro gravando para o ficheiro"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Falhou a ligação"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Erro interno"
@@ -2574,11 +2574,15 @@ msgstr "Erro de I/O ao gravar a cache de código fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2588,7 +2592,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2597,7 +2601,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:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2605,7 +2609,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Tamanho incorreto"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 317b14e7c..3f7df25d0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-06-16 10:24-0300\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
+"PO-Revision-Date: 2006-02-11 17:57-0200\n"
"Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -232,17 +232,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, fornea um nome para este Disco, 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 mdia: 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 "Pepita este processo para o restante dos CDs em seu conjunto."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -519,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Falha ao checar %s"
@@ -706,13 +704,13 @@ msgid "%s (due to %s) "
msgstr "%s (por causa de %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 pacotes essenciais a seguir sero removidos\n"
-"Isso NO deve ser feito a menos que voc saiba exatamente o que est fazendo!"
+"AVISO: Os pacotes essenciais a seguir sero removidos.\n"
+"Isso NO deveria ser feito a menos que voc saiba exatamente o que "
+"voc est fazendo !"
#: cmdline/apt-get.cc:577
#, c-format
@@ -773,7 +771,7 @@ msgstr "AVISO : Os pacotes a seguir no podem ser autenticados !"
#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Aviso de autenticao sobrescrito.\n"
#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
@@ -790,15 +788,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 ""
+"Erro Interno, Install Packages foi chamado com pacotes quebrados !"
#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
msgstr "Pacotes precisam ser removidos mas a remoo est desabilitada."
#: cmdline/apt-get.cc:775
-#, fuzzy
msgid "Internal error, Ordering didn't finish"
-msgstr "Erro Interno ao adicionar um desvio"
+msgstr "Erro Interno, Ordenao no finalizou"
#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
@@ -812,6 +810,7 @@ msgstr "A lista de fontes no pde ser lida."
#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"Que estranho .. Os tamanhos no batem, informe apt@packages.debian.org"
#: cmdline/apt-get.cc:821
#, c-format
@@ -835,9 +834,9 @@ msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de desempacotar, %sB de espao em disco sero liberados.\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 no tem espao suficiente em %s"
+msgstr "No foi possvel determinar o espao livre em %s"
#: cmdline/apt-get.cc:849
#, c-format
@@ -853,13 +852,13 @@ msgid "Yes, do as I say!"
msgstr "Sim, faa o que 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 destruidor\n"
+"Voc est prestes a fazer algo potencialmente destruidor.\n"
"Para continuar digite a frase '%s'\n"
" ?] "
@@ -1076,9 +1075,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 quebrou coisas"
#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
@@ -1090,9 +1088,9 @@ msgid "Unable to find a source package for %s"
msgstr "Impossvel encontrar um pacote fonte para %s"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr "Pulando desempacotamento de pacote fonte j desempacotado em %s\n"
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omitindo arquivo j obtido '%s'\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1131,7 +1129,7 @@ msgstr "Comando de desempacotamento '%s' falhou.\n"
#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Confira se o pacote dpkg-dev est instalado.\n"
#: cmdline/apt-get.cc:2086
#, c-format
@@ -1454,7 +1452,7 @@ msgid "Duplicate conf file %s/%s"
msgstr "Arquivo de confgiurao 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 gravar arquivo %s"
@@ -1602,7 +1600,6 @@ msgid "Internal error adding a diversion"
msgstr "Erro Interno ao adicionar um desvio"
#: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
msgid "The pkg cache must be initialized first"
msgstr "O cache de pacotes deve ser inicializado primeiro"
@@ -1677,20 +1674,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossvel desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Arquivo no encontrado"
+msgstr "Disco no encontrado."
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Arquivo no encontrado"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Falha ao checar"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Falha ao definir hora de modificao"
@@ -1818,7 +1814,7 @@ msgstr "Conexo do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossvel aceitar conexo"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do arquivo"
@@ -1905,40 +1901,43 @@ msgstr "Impossvel conectar em %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Sando."
#: methods/gpgv.cc:191
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Erro interno : Assintura boa, mas no foi possvel determinar a "
+"impresso digital da chave ?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Ao menos uma assinatura invlida foi encontrada."
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "No foi possvel obter trava %s"
+msgstr "No foi possvel executar "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " ao verificar assinatura (o gnupg est instalado ?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Erro desconhecido executando gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "Os pacotes extra a seguir sero instalados:"
+msgstr "As seguintes assinaturas foram invlidas :\n"
#: methods/gpgv.cc:244
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"As assinaturas a seguir no puderam ser verificadas devido a chave "
+"pblica no estar disponvel :\n"
#: methods/gzip.cc:57
#, c-format
@@ -1950,76 +1949,76 @@ msgstr "No foi possvel abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Aguardando por cabealhos"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma nica linha de cabealho acima de %u caracteres"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linha de cabealho ruim"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor http enviou um cabealho de resposta invlido"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor http enviou um cabealho Conten-Length invlido"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor http enviou um cabealho Conten-Range invlido"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range quebrado"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Seleo falhou."
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Conexo expirou"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Erro gravando para arquivo de sada"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Erro gravando para arquivo"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Erro gravando para o arquivo"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor Ponto remoto fechou a conexo"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Dados de cabealho ruins"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Conexo falhou."
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Erro interno"
@@ -2363,7 +2362,7 @@ msgid "Malformed line %u in source list %s (type)"
msgstr "Linha malformada %u no arquivo 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 "Tipo '%s' no conhecido na linha %u na lista de fontes %s"
@@ -2422,7 +2421,7 @@ msgstr "Diretrio de repositrio %spartial est faltando."
#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Fazendo o download do arquivo %li de %li (%s restantes)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2435,12 +2434,11 @@ msgid "Method %s did not start correctly"
msgstr "Mtodo %s no 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 mdia: Por favor insira o disco nomeado\n"
-" '%s'\n"
-"no drive '%s' e pressione enter\n"
+"Por favor, insira o disco nomeado : '%s' no leitor '%s' e pressione "
+"enter."
#: apt-pkg/init.cc:120
#, c-format
@@ -2490,37 +2488,37 @@ msgid "Cache has an incompatible versioning system"
msgstr "O Cache possui um sistema de verses incompatvel"
#: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr "Um erro ocorreu processando %s (NovoPacote)"
#: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Um erro ocorreu processando %s (UsePacote1)"
#: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Um erro ocorreu processando %s (UsePacote2)"
#: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
#: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Um erro ocorreu processando %s (NovaVerso1)"
#: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Um erro ocorreu processando %s (UsePacote3)"
#: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Um erro ocorreu processando %s (NovaVerso2)"
@@ -2541,14 +2539,14 @@ msgstr ""
"Ops, voc excedeu o nmero de dependncias que este APT capaz de suportar."
#: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Um erro ocorreu processando %s (FindPkg)"
+msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
#: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Um erro ocorreu processando %s (CollectFileProvides)"
+msgstr "Um erro ocorreu processando %s (ColetarArquivoFornece)"
#: apt-pkg/pkgcachegen.cc:260
#, c-format
@@ -2573,11 +2571,15 @@ msgstr "Erro de I/O ao gravar cache fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeao falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "No existem chaves pblicas para os seguintes IDs de chaves :\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2587,7 +2589,7 @@ msgstr ""
"que voc precisa consertar manualmente este pacote. (devido a arquitetura "
"no especificada)."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2596,7 +2598,7 @@ msgstr ""
"No foi possvel localizar arquivo para o pacote %s. Isto pode significar "
"que voc precisa consertar manualmente este pacote."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2604,7 +2606,7 @@ msgstr ""
"Os arquivos de ndice de pacotes esto corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Tamanho incorreto"
@@ -2712,54 +2714,54 @@ msgstr ""
"combinam\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Abrindo %s"
+msgstr "Preparando %s"
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Abrindo %s"
+msgstr "Desempacotando %s"
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Abrindo arquivo de configurao %s"
+msgstr "Preparando para configurar %s"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Conectando a %s"
+msgstr "Configurando %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 "Preparando para a remoo de %s"
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Abrindo %s"
+msgstr "Removendo %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 "Preparando para remoo de %s e sua configurao"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "%s e sua configurao removidos"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
diff --git a/po/ro.po b/po/ro.po
index ff3c6dfbc..10bf9b0f3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-08-25 17:43+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
@@ -526,7 +526,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Eşuare în determinarea stării %s"
@@ -1097,7 +1097,7 @@ msgstr "Nu pot găsi o sursă pachet pentru %s"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
#: cmdline/apt-get.cc:1983
@@ -1693,12 +1693,12 @@ msgstr "Fişier negăsit"
msgid "File not found"
msgstr "Fişier negăsit"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Eşuare de determinare a stării"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Eşuare la ajustarea timpului"
@@ -1826,7 +1826,7 @@ msgstr "Timp de conectare data socket expirat"
msgid "Unable to accept connection"
msgstr "Nu pot accepta conexiune"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la indexarea fişierului"
@@ -1958,77 +1958,77 @@ msgstr "Nu pot deschide conexiunea pentru %s"
msgid "Read error from %s process"
msgstr "Eroare de citire din procesul %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "În aşteptarea antetelor"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Primit o singură linie de antet peste %u caractere"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Serverul http a trimis un antet de răspuns necorespunzător"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Acest server http are zonă de suport necorespunzătoare"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Format de date necunoscut"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Eşuarea selecţiei"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Eroare la scrierea fişierului de rezultat"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Eroare la scrierea în fişier"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fişierul"
-#: methods/http.cc:879
+#: 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ţă"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Eroare la citirea de pe server"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Conectare eşuată"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Eroare internă"
@@ -2581,11 +2581,15 @@ msgstr "Eroare IO în timpul salvării sursei cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eşuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2594,7 +2598,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2603,7 +2607,7 @@ msgstr ""
"N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna "
"că aveţi nevoie să depanaţi manual acest pachet."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2611,7 +2615,7 @@ msgstr ""
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
diff --git a/po/ru.po b/po/ru.po
index 50cd1a91f..3ad8e11ce 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,14 +6,14 @@
# Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2004.
# Dmitry Astapov <adept@umc.com.ua>, 2004.
# Dmitry Astapov <adept@despammed.com>, 2004.
-# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005.
+# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: apt_po_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-10-22 12:24+0400\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
+"PO-Revision-Date: 2006-01-21 14:55+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -237,16 +237,15 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Задайте имя для этого диска, например 'Debian 2.1r1 Disk 1'"
#: cmdline/apt-cdrom.cc:93
-#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
-msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
+msgstr "Вставьте диск в устройство и нажмите ввод"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Повторите этот процесс для всех имеющихся CD."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -300,7 +299,7 @@ msgid ""
msgstr ""
"Использование: apt-extracttemplates file1 [file2 ...]\n"
"\n"
-"apt-extracttemplates извлекает из пакетов Дебиан конфигурационные скрипты\n"
+"apt-extracttemplates извлекает из пакетов Debian конфигурационные скрипты\n"
"и файлы-шаблоны\n"
"\n"
"Опции:\n"
@@ -337,8 +336,7 @@ msgstr ""
#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
-msgstr ""
-"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
+msgstr "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
@@ -531,7 +529,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Превышен лимит в %sB в DeLink.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Не удалось получить атрибуты %s"
@@ -592,8 +590,7 @@ msgstr "Неизвестный алгоритм сжатия '%s'"
#: ftparchive/multicompress.cc:105
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr ""
-"Для получения сжатого вывода %s необходимо включить использования сжатия"
+msgstr "Для получения сжатого вывода %s необходимо включить использования сжатия"
#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
@@ -711,8 +708,7 @@ msgstr "Пакеты, будут заменены на более СТАРЫЕ
#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
-msgstr ""
-"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
+msgstr "Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
#: cmdline/apt-get.cc:538
#, c-format
@@ -842,14 +838,12 @@ msgstr "Необходимо скачать %sБ архивов.\n"
#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr ""
-"После распаковки объем занятого дискового пространства возрастёт на %sB.\n"
+msgstr "После распаковки объем занятого дискового пространства возрастёт на %sB.\n"
#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr ""
-"После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
+msgstr "После распаковки объем занятого дискового пространства уменьшится на %sB.\n"
#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
@@ -931,8 +925,7 @@ msgstr "Заметьте, вместо %2$s выбирается %1$s\n"
#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
+msgstr "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
#: cmdline/apt-get.cc:1058
#, c-format
@@ -1076,7 +1069,7 @@ msgstr "Будут установлены следующие дополните
#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
-msgstr "Настойчиво рекомендуемые пакеты:"
+msgstr "Предлагаемые пакеты:"
#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
@@ -1084,7 +1077,7 @@ msgstr "Рекомендуемые пакеты:"
#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
-msgstr "Рассчёт обновлений... "
+msgstr "Расчёт обновлений... "
#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
@@ -1110,11 +1103,9 @@ msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходными текстами для %s"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr ""
-"Распаковка исходных текстов пропущена, так как в %s уже находятся "
-"распакованные исходные тексты\n"
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Пропускаем уже загруженный файл '%s'\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1390,12 +1381,10 @@ msgstr "установленных пакетов. Это может приве
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-"возникновению новых из-за неудовлетворённых зависимостей. Это нормально,"
+msgstr "возникновению новых из-за неудовлетворённых зависимостей. Это нормально,"
#: 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 ""
"важны только ошибки, указанные выше. Исправьте их и выполните установку ещё "
"раз"
@@ -1703,12 +1692,12 @@ msgstr "Диск не найден."
msgid "File not found"
msgstr "Файл не найден"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Не удалось получить атрибуты"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Не удалось установить время модификации"
@@ -1840,7 +1829,7 @@ msgstr "Время установления соединения для соке
msgid "Unable to accept connection"
msgstr "Невозможно принять соединение"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема при хэшировании файла"
@@ -1917,8 +1906,7 @@ msgstr "Временная ошибка при попытке получить I
#: methods/connect.cc:174
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr ""
-"Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)"
+msgstr "Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)"
#: methods/connect.cc:221
#, c-format
@@ -1932,8 +1920,7 @@ msgstr ""
"работы."
#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
"ключа?!"
@@ -1963,8 +1950,7 @@ msgstr "Следующие подписи неверные:\n"
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr ""
-"Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n"
+msgstr "Следующие подписи не могут быть проверены, так как недоступен общий ключ:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1976,76 +1962,76 @@ msgstr "Не удалось открыть канал для %s"
msgid "Read error from %s process"
msgstr "Ошибка чтения из процесса %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Ожидание заголовков"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен заголовок длиннее %u символов"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Неверный заголовок"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-сервер послал неверный заголовок"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http сервер послал неверный заголовок Content-Length"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-сервер послал неверный заголовок Content-Range"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Неизвестный формат данных"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Время ожидания для соединения истекло"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Ошибка записи в выходной файл"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтения, удалённый сервер прервал соединение"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Внутренняя ошибка"
@@ -2222,8 +2208,7 @@ msgstr "Ожидалось завершение процесса %s, но он
#: apt-pkg/contrib/fileutl.cc:387
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr ""
-"Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
+msgstr "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s."
#: apt-pkg/contrib/fileutl.cc:390
#, c-format
@@ -2243,8 +2228,7 @@ msgstr "Не могу открыть файл %s"
#: apt-pkg/contrib/fileutl.cc:492
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr ""
-"ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
+msgstr "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
#: apt-pkg/contrib/fileutl.cc:522
#, c-format
@@ -2294,7 +2278,7 @@ msgstr "ПредЗависит"
#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
-msgstr "Настойчиво рекомендует"
+msgstr "Предлагает"
#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
@@ -2362,8 +2346,7 @@ msgstr "Искажённая строка %lu в списке источнико
#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
+msgstr "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
#: apt-pkg/sourcelist.cc:99
#, c-format
@@ -2396,9 +2379,9 @@ msgid "Malformed line %u in source list %s (type)"
msgstr "Искажённая строка %u в списке источников %s (тип)"
#: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Неизвестен тип '%s' в строке %u в списке источников %s"
+msgstr "Неизвестный тип '%s' в строке %u в списке источников %s"
#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
@@ -2424,8 +2407,7 @@ msgstr "Не поддерживается индексный файл типа '
#: apt-pkg/algorithms.cc:241
#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Пакет %s нуждается в переустановке, но я не могу найти архив для него."
#: apt-pkg/algorithms.cc:1059
@@ -2593,11 +2575,15 @@ msgstr "Ошибка ввода/вывода при попытке сохран
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Недоступен общий ключ для следующих ключей (ID):\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2606,7 +2592,7 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2615,13 +2601,12 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:814
+#: 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 "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Не совпадает размер"
@@ -2781,3 +2766,4 @@ msgstr "Удалён вместе с настройками %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Соединение закрыто преждевременно"
+
diff --git a/po/sk.po b/po/sk.po
index 3b2fc47cf..03ba78fa0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2006-01-07 13:39+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
+"PO-Revision-Date: 2006-01-23 10:19+0100\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
@@ -512,7 +512,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "%s sa nedá vyhodnotiť"
@@ -1079,7 +1079,7 @@ msgstr "Nedá sa nájsť zdrojový balík pre %s"
#: cmdline/apt-get.cc:1959
#, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor '%s'\n"
#: cmdline/apt-get.cc:1983
@@ -1662,12 +1662,12 @@ msgstr "Disk sa nenašiel."
msgid "File not found"
msgstr "Súbor sa nenašiel"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Vyhodnotenie zlyhalo"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Zlyhalo nastavenie času zmeny"
@@ -1795,7 +1795,7 @@ msgstr "Uplynulo spojenie dátového socketu"
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashovaním súboru"
@@ -1929,76 +1929,76 @@ msgstr "Nedá sa otvoriť rúra pre %s"
msgid "Read error from %s process"
msgstr "Chyba pri čítaní z procesu %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Čaká sa na hlavičky"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnú hlavičku odpovede"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnú hlavičku Content-Length"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnú hlavičku Content-Range"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -2539,11 +2539,15 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súčtov"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2552,7 +2556,7 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2561,13 +2565,13 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
diff --git a/po/sl.po b/po/sl.po
index 77aa60ec2..8d3c70ed2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure uhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -514,7 +514,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Doseena meja RazVezovanja %sB.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Napaka pri postavitvi %s"
@@ -1083,7 +1083,7 @@ msgstr "Izvornega paketa za %s ni mogoe najti"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
#: cmdline/apt-get.cc:1983
@@ -1668,12 +1668,12 @@ msgstr "Datoteke ni mogoe najti"
msgid "File not found"
msgstr "Datoteke ni mogoe najti"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Doloitev ni uspela"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Nastavitev asa spremembe ni uspela"
@@ -1801,7 +1801,7 @@ msgstr "Povezava podatkovne vtinice potekla"
msgid "Unable to accept connection"
msgstr "Ni mogoe sprejeti povezave"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Teava pri razprevanju datoteke"
@@ -1933,76 +1933,76 @@ msgstr "Ni mogoe odprti %s"
msgid "Read error from %s process"
msgstr "Napaka pri branju iz procesa %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "akanje na glave"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Napana vrstica glave"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Strenik HTTP je poslal napano glavo odgovora"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Ta strenik HTTP ima pokvarjen obseg podpore"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "as za povezavo se je iztekel"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika "
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Napaka pri branju s strenika"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Napani podatki glave"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Notranja napaka"
@@ -2545,11 +2545,15 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2558,7 +2562,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket (zaradi manjkajoega arhiva)."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2567,7 +2571,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2575,7 +2579,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
diff --git a/po/sv.po b/po/sv.po
index ee87218aa..797271822 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2006-01-08 03:25+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
+"PO-Revision-Date: 2006-01-21 16:24+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,8 +20,12 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Paket %s version %s har ett beroende som inte kan tillfredsstllas:\n"
-#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
-#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:175
+#: cmdline/apt-cache.cc:527
+#: cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771
+#: cmdline/apt-cache.cc:989
+#: cmdline/apt-cache.cc:1357
#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
@@ -83,7 +87,8 @@ msgstr "Totalt bortkastat utrymme: "
msgid "Total space accounted for: "
msgstr "Totalt utrymme som kan redogras fr: "
-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:446
+#: cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr "Paketfilen %s r ur synk."
@@ -100,7 +105,8 @@ msgstr "Inga paket funna"
msgid "Package files:"
msgstr "\"Package\"-filer:"
-#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+#: cmdline/apt-cache.cc:1469
+#: cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Cachen r ur synk, kan inte korsreferera en paketfil"
@@ -115,7 +121,8 @@ msgstr "%4i %s\n"
msgid "Pinned packages:"
msgstr "Fastnlade paket:"
-#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+#: cmdline/apt-cache.cc:1494
+#: cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr "(ej funnen)"
@@ -124,7 +131,8 @@ msgstr "(ej funnen)"
msgid " Installed: "
msgstr " Installerad: "
-#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+#: cmdline/apt-cache.cc:1517
+#: cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr "(ingen)"
@@ -147,9 +155,13 @@ msgstr " Versionstabell:"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1651
+#: cmdline/apt-cdrom.cc:138
+#: cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225
+#: ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2378
+#: cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s fr %s %s kompilerad den %s %s\n"
@@ -301,7 +313,8 @@ msgstr ""
" -c=? Ls denna instllningsfil.\n"
" -o=? Ange valfri instllningsflagga. T.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267
+#: apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr "Kunde inte skriva till %s"
@@ -310,13 +323,17 @@ msgstr "Kunde inte skriva till %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan inte ta reda p debconfs version. r debconf installerat?"
-#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+#: ftparchive/apt-ftparchive.cc:167
+#: ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
msgstr "Listan ver filtillgg fr Packages r fr lng"
-#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
-#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
-#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#: ftparchive/apt-ftparchive.cc:169
+#: ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270
+#: ftparchive/apt-ftparchive.cc:292
#, c-format
msgid "Error processing directory %s"
msgstr "Fel vid behandling av katalogen %s"
@@ -475,7 +492,8 @@ msgstr "V: "
msgid "E: Errors apply to file "
msgstr "F: Felen gller filen "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:151
+#: ftparchive/writer.cc:181
#, c-format
msgid "Failed to resolve %s"
msgstr "Misslyckades att sl upp %s"
@@ -515,8 +533,12 @@ msgstr "*** Misslyckades att lnka %s till %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Avlnkningsgrns p %sB ndd.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: ftparchive/writer.cc:358
+#: apt-inst/extract.cc:181
+#: apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
+#: apt-inst/deb/dpkgdb.cc:121
+#: methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Misslyckades att ta status p %s"
@@ -526,13 +548,15 @@ msgstr "Misslyckades att ta status p %s"
msgid "Archive had no package field"
msgstr "Arkivet har inget package-flt"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#: ftparchive/writer.cc:394
+#: ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen post i override-filen\n"
# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#: ftparchive/writer.cc:437
+#: ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig fr %s r %s ej %s\n"
@@ -542,32 +566,38 @@ msgstr " ansvarig fr %s r %s ej %s\n"
msgid "Internal error, could not locate member %s"
msgstr "Internt fel, kunde inta hitta delen %s"
-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+#: ftparchive/contents.cc:353
+#: ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Misslyckades att allokera minne"
-#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#: ftparchive/override.cc:38
+#: ftparchive/override.cc:146
#, c-format
msgid "Unable to open %s"
msgstr "Kunde inte ppna %s"
# parametrar: filnamn, radnummer
-#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#: ftparchive/override.cc:64
+#: ftparchive/override.cc:170
#, c-format
msgid "Malformed override %s line %lu #1"
msgstr "Felaktig override %s rad %lu #1"
-#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#: ftparchive/override.cc:78
+#: ftparchive/override.cc:182
#, c-format
msgid "Malformed override %s line %lu #2"
msgstr "Felaktig override %s rad %lu #2"
-#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#: ftparchive/override.cc:92
+#: ftparchive/override.cc:195
#, c-format
msgid "Malformed override %s line %lu #3"
msgstr "Felaktig override %s rad %lu #3"
-#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#: ftparchive/override.cc:131
+#: ftparchive/override.cc:205
#, c-format
msgid "Failed to read the override file %s"
msgstr "Misslyckades att lsa override-filen %s"
@@ -583,7 +613,8 @@ msgstr "Oknd komprimeringsalgoritm \"%s\""
msgid "Compressed output %s needs a compression set"
msgstr "Komprimerad utdata %s behver en komprimeringsuppsttning"
-#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:172
+#: methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
msgstr "Misslyckades att skapa IPC-rr till underprocess"
@@ -629,7 +660,8 @@ msgstr "Misslyckades att lsa vid berkning av MD5"
msgid "Problem unlinking %s"
msgstr "Problem med att lnka ut %s"
-#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:490
+#: apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Misslyckades att byta namn p %s till %s"
@@ -638,7 +670,8 @@ msgstr "Misslyckades att byta namn p %s till %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:142
+#: cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid tolkning av reguljrt uttryck - %s"
@@ -783,7 +816,8 @@ msgstr "Installera dessa paket utan verifiering [j/N]? "
msgid "Some packages could not be authenticated"
msgstr "Ngra av paketen kunde inte autentiseras"
-#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr "Problem har uppsttt och -y anvndes utan --force-yes"
@@ -799,20 +833,22 @@ msgstr "Paket mste tas bort men \"Remove\" r inaktiverat."
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen frdigstlldes inte"
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
+#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:1809
+#: cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr "Kunde inte lsa hmtningskatalogen."
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
+#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:1890
+#: cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Listan ver kllor kunde inte lsas."
#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Konstigt.. storlekarna stmde inte, skicka e-post till apt@packages.debian."
-"org"
+msgstr "Konstigt.. storlekarna stmde inte, skicka e-post till apt@packages.debian.org"
#: cmdline/apt-get.cc:821
#, c-format
@@ -834,7 +870,8 @@ msgstr "Efter uppackning kommer %sB ytterligare diskutrymme anvndas.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter uppackning kommer %sB frigras p disken.\n"
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
+#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte lsa av ledigt utrymme i %s"
@@ -844,7 +881,8 @@ msgstr "Kunde inte lsa av ledigt utrymme i %s"
msgid "You don't have enough free space in %s."
msgstr "Du har inte tillrckligt ledigt utrymme i %s"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "\"Trivial Only\" angavs, men detta r inte en trivial handling."
@@ -864,7 +902,8 @@ msgstr ""
" ?] "
# Visas d man svarar nej
-#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Avbryter."
@@ -872,7 +911,9 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortstta [J/n]? "
-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:1365
+#: cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades att hmta %s %s\n"
@@ -881,17 +922,14 @@ msgstr "Misslyckades att hmta %s %s\n"
msgid "Some files failed to download"
msgstr "Misslyckades att hmta vissa filer"
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
+#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Hmtningen frdig i \"endast-hmta\"-lge"
#: cmdline/apt-get.cc:986
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Vissa arkiv kunte inte hmtas. Prva eventuellt \"apt-get update\" eller med "
-"--fix-missing."
+msgid "Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?"
+msgstr "Vissa arkiv kunte inte hmtas. Prva eventuellt \"apt-get update\" eller med --fix-missing."
#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
@@ -913,8 +951,7 @@ msgstr "Observera, vljer %s istllet fr %s\n"
#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Hoppar ver %s, det r redan installerat och uppgradering har inte valts.\n"
+msgstr "Hoppar ver %s, det r redan installerat och uppgradering har inte valts.\n"
#: cmdline/apt-get.cc:1058
#, c-format
@@ -983,23 +1020,21 @@ msgstr "Vald version %s (%s) fr %s\n"
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
+#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Kunde inte lsa listkatalogen"
#: cmdline/apt-get.cc:1384
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla "
-"anvnts istllet."
+msgid "Some index files failed to download, they have been ignored, or old ones used instead."
+msgstr "Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla anvnts istllet."
#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade frstrde ngot"
-#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1502
+#: cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
@@ -1014,12 +1049,8 @@ msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan mjligen rtta detta genom att kra \"apt-get -f install\":"
#: cmdline/apt-get.cc:1558
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket "
-"(eller ange en lsning)."
+msgid "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."
+msgstr "Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket (eller ange en lsning)."
#: cmdline/apt-get.cc:1570
msgid ""
@@ -1067,7 +1098,9 @@ msgstr "Rekommenderade paket:"
msgid "Calculating upgrade... "
msgstr "Berknar uppgradering... "
-#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1707
+#: methods/ftp.cc:702
+#: methods/connect.cc:101
msgid "Failed"
msgstr "Misslyckades"
@@ -1075,7 +1108,8 @@ msgstr "Misslyckades"
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlsaren brt snder saker"
@@ -1083,14 +1117,15 @@ msgstr "Internt fel, problemlsaren brt snder saker"
msgid "Must specify at least one package to fetch source for"
msgstr "Du mste ange tminstone ett paket att hmta kllkod fr"
-#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
+#: cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta ngot kllkodspaket fr %s"
#: cmdline/apt-get.cc:1959
#, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar ver redan nedladdad fil \"%s\"\n"
#: cmdline/apt-get.cc:1983
@@ -1157,27 +1192,18 @@ msgstr "%s har inga byggberoenden.\n"
#: cmdline/apt-get.cc:2221
#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas"
+msgid "%s dependency for %s cannot be satisfied because the package %s cannot be found"
+msgstr "%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas"
#: cmdline/apt-get.cc:2273
#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
-msgstr ""
-"%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga "
-"versioner av paketet %s uppfyller versionskraven"
+msgid "%s dependency for %s cannot be satisfied because no available versions of package %s can satisfy version requirements"
+msgstr "%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga versioner av paketet %s uppfyller versionskraven"
#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s "
-"r fr nytt"
+msgstr "Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s r fr nytt"
#: cmdline/apt-get.cc:2333
#, c-format
@@ -1350,8 +1376,12 @@ msgstr ""
msgid "Bad default setting!"
msgstr "Ogiltig standardinstllning!"
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
+#: dselect/install:51
+#: dselect/install:83
+#: dselect/install:87
+#: dselect/install:93
+#: dselect/install:104
+#: dselect/update:45
msgid "Press enter to continue."
msgstr "Tryck Enter fr att fortstta."
@@ -1371,8 +1401,7 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr "saknade beroenden. Detta r okej, bara felen ovanfr detta"
#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+msgid "above this message are important. Please fix them and run [I]nstall again"
msgstr "meddelande r viktiga. Frsk rtta dem och [I]nstallera igen"
#: dselect/update:30
@@ -1387,7 +1416,8 @@ msgstr "Misslyckades att skapa rr"
msgid "Failed to exec gzip "
msgstr "Misslyckades att kra gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:180
+#: apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Frdrvat arkiv"
@@ -1408,7 +1438,8 @@ msgstr "Ogiltig arkivsignatur"
msgid "Error reading archive member header"
msgstr "Misslyckades att lsa huvud fr arkivdel"
-#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+#: apt-inst/contrib/arfile.cc:93
+#: apt-inst/contrib/arfile.cc:105
msgid "Invalid archive member header"
msgstr "Ogiltigt arkivdelshuvud"
@@ -1452,17 +1483,21 @@ msgstr "Omdirigering %s -> %s inlagd tv gnger"
msgid "Duplicate conf file %s/%s"
msgstr "Duplicerad konfigurationsfil %s/%s"
-#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:45
+#: apt-inst/dirstream.cc:50
+#: apt-inst/dirstream.cc:53
#, c-format
msgid "Failed to write file %s"
msgstr "Misslyckades att skriva filen %s"
-#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#: apt-inst/dirstream.cc:96
+#: apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
msgstr "Misslyckades att stnga filen %s"
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:96
+#: apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Skvgen %s r fr lng"
@@ -1482,7 +1517,8 @@ msgstr "Katalogen %s r omdirigerad"
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Paketet frsker skriva till omdirigeringsmlet %s/%s"
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:157
+#: apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Omdirigeringsskvgen r fr lng"
@@ -1510,9 +1546,12 @@ msgstr "Skriver ver pakettrff utan version fr %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Filen %s/%s skriver ver den i paketet %s"
-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
-#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:467
+#: apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153
+#: apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421
+#: apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Kunde inte lsa %s"
@@ -1522,12 +1561,14 @@ msgstr "Kunde inte lsa %s"
msgid "Unable to stat %s"
msgstr "Kunde inte ta status p %s"
-#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#: apt-inst/deb/dpkgdb.cc:55
+#: apt-inst/deb/dpkgdb.cc:61
#, c-format
msgid "Failed to remove %s"
msgstr "Misslyckades att ta bort %s"
-#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#: apt-inst/deb/dpkgdb.cc:110
+#: apt-inst/deb/dpkgdb.cc:112
#, c-format
msgid "Unable to create %s"
msgstr "Kunde inte skapa %s"
@@ -1542,8 +1583,10 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr "Katalogerna info och temp mste ligga p samma filsystem"
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-inst/deb/dpkgdb.cc:139
+#: apt-pkg/pkgcachegen.cc:643
+#: apt-pkg/pkgcachegen.cc:712
+#: apt-pkg/pkgcachegen.cc:717
#: apt-pkg/pkgcachegen.cc:840
msgid "Reading package lists"
msgstr "Lser paketlistor"
@@ -1554,7 +1597,8 @@ msgstr "Lser paketlistor"
msgid "Failed to change to the admin dir %sinfo"
msgstr "Kunde inte g till adminkatalogen %sinfo"
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:201
+#: apt-inst/deb/dpkgdb.cc:355
#: apt-inst/deb/dpkgdb.cc:448
msgid "Internal error getting a package name"
msgstr "Internt fel nr namn p Package-fil skulle hmtas"
@@ -1565,15 +1609,11 @@ msgstr "Lser fillista"
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
-msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
-msgstr ""
-"Misslyckades att ppna listfilen \"%sinfo/%s\". Om du inte kan terskapa "
-"filen, skapa en tom och installera omedelbart om samma version av paketet!"
+msgid "Failed to open the list file '%sinfo/%s'. If you cannot restore this file then make it empty and immediately re-install the same version of the package!"
+msgstr "Misslyckades att ppna listfilen \"%sinfo/%s\". Om du inte kan terskapa filen, skapa en tom och installera omedelbart om samma version av paketet!"
-#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#: apt-inst/deb/dpkgdb.cc:229
+#: apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Failed reading the list file %sinfo/%s"
msgstr "Misslyckades att lsa listfilen %sinfo/%s"
@@ -1591,7 +1631,8 @@ msgstr "Misslyckades att ppna omdirigeringsfilen %sdiversions"
msgid "The diversion file is corrupted"
msgstr "Omdirigeringsfilen r trasig"
-#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:331
+#: apt-inst/deb/dpkgdb.cc:336
#: apt-inst/deb/dpkgdb.cc:341
#, c-format
msgid "Invalid line in the diversion file: %s"
@@ -1624,7 +1665,8 @@ msgstr "Felaktiv ConfFile-sektion i statusfilen. Offset %lu"
msgid "Error parsing MD5. Offset %lu"
msgstr "Fel vid tolkning av MD5. Offset %lu"
-#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: apt-inst/deb/debfile.cc:42
+#: apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Detta r inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
@@ -1658,12 +1700,8 @@ msgid "Unable to read the cdrom database %s"
msgstr "Kunde inte lsa cd-rom-databasen %s"
#: methods/cdrom.cc:123
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-"Anvnd apt-cdrom fr att APT ska knna igen denna cd. apt-get update kan "
-"inte anvndas fr att lgga till skivor"
+msgid "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update cannot be used to add new CD-ROMs"
+msgstr "Anvnd apt-cdrom fr att APT ska knna igen denna cd. apt-get update kan inte anvndas fr att lgga till skivor"
#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
@@ -1678,16 +1716,22 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande anvnds."
msgid "Disk not found."
msgstr "Disk ej funnen."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:177
+#: methods/file.cc:79
+#: methods/rsh.cc:264
msgid "File not found"
msgstr "Filen ej funnen"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42
+#: methods/gpgv.cc:269
+#: methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Kunde inte ta status"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79
+#: methods/gpgv.cc:266
+#: methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Misslyckades stta modifieringstid"
@@ -1708,7 +1752,8 @@ msgstr "Kunde inte ta reda p namn p partner"
msgid "Unable to determine the local name"
msgstr "Kunde inte ta reda p eget namn"
-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: methods/ftp.cc:204
+#: methods/ftp.cc:232
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Servern nekade anslutningen och sade: %s"
@@ -1724,12 +1769,8 @@ msgid "PASS failed, server said: %s"
msgstr "PASS misslyckades, servern sade: %s"
#: methods/ftp.cc:237
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::"
-"ProxyLogin r tom."
+msgid "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin is empty."
+msgstr "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::ProxyLogin r tom."
#: methods/ftp.cc:265
#, c-format
@@ -1741,7 +1782,10 @@ msgstr "Inloggningsskriptskommandot \"%s\" misslyckades, servern sade: %s"
msgid "TYPE failed, server said: %s"
msgstr "TYPE misslyckades, servern sade: %s"
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:329
+#: methods/ftp.cc:440
+#: methods/rsh.cc:183
+#: methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Inget svar p frbindelsen inom tidsgrnsen"
@@ -1749,23 +1793,31 @@ msgstr "Inget svar p frbindelsen inom tidsgrnsen"
msgid "Server closed the connection"
msgstr "Servern stngde frbindelsen"
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+#: methods/ftp.cc:338
+#: apt-pkg/contrib/fileutl.cc:471
+#: methods/rsh.cc:190
msgid "Read error"
msgstr "Lsfel"
-#: methods/ftp.cc:345 methods/rsh.cc:197
+#: methods/ftp.cc:345
+#: methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Ett svar spillde bufferten."
-#: methods/ftp.cc:362 methods/ftp.cc:374
+#: methods/ftp.cc:362
+#: methods/ftp.cc:374
msgid "Protocol corruption"
msgstr "Protokollet frdrvat"
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+#: methods/ftp.cc:446
+#: apt-pkg/contrib/fileutl.cc:510
+#: methods/rsh.cc:232
msgid "Write error"
msgstr "Skrivfel"
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+#: methods/ftp.cc:687
+#: methods/ftp.cc:693
+#: methods/ftp.cc:729
msgid "Could not create a socket"
msgstr "Kunde inte skapa uttag (socket)"
@@ -1815,7 +1867,9 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgrns"
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutning"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864
+#: methods/http.cc:958
+#: methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lgga filen till hashtabellen"
@@ -1824,7 +1878,8 @@ msgstr "Problem med att lgga filen till hashtabellen"
msgid "Unable to fetch file, server said '%s'"
msgstr "Kunde inte hmta filen, servern sade \"%s\""
-#: methods/ftp.cc:892 methods/rsh.cc:322
+#: methods/ftp.cc:892
+#: methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Datauttag (socket) fick inte svar inom tidsgrns"
@@ -1877,7 +1932,8 @@ msgstr "Kunde inte ansluta till %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:134
+#: methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Ansluter till %s"
@@ -1908,10 +1964,8 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Argumentslistan frn Acquire::gpgv::Options fr lng. Avslutar."
#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!"
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
@@ -1935,12 +1989,8 @@ msgid "The following signatures were invalid:\n"
msgstr "Fljande signaturer r ogiltiga:\n"
#: methods/gpgv.cc:244
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-"Fljande signaturer kunde inte verifieras fr att den publika nyckeln inte "
-"r tillgnglig:\n"
+msgid "The following signatures couldn't be verified because the public key is not available:\n"
+msgstr "Fljande signaturer kunde inte verifieras fr att den publika nyckeln inte r tillgnglig:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1953,76 +2003,77 @@ msgstr "Kunde inte ppna rr fr %s"
msgid "Read error from %s process"
msgstr "Lsfel p %s-processen"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Vntar p huvuden"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fick en ensam huvudrad p %u tecken"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Trasig huvudrad"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549
+#: methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-servern snde ett ogiltigt svarshuvud"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-servern snde ett ogiltigt Content-Length-huvud"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-servern snde ett ogiltigt Content-Range-huvud"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Denna http-servers std fr delvis hmtning fungerar inte"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Oknt datumformat"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Tidsgrnsen fr anslutningen nddes"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Fel vid lsning frn server"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Trasigt data i huvud"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Anslutning misslyckades"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Internt fel"
@@ -2080,7 +2131,8 @@ msgstr "Syntaxfel %s:%u: Direktiv kan endast utfras p toppnivn"
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaxfel %s:%u: Fr mnga nstlade inkluderingar"
-#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#: apt-pkg/contrib/configuration.cc:695
+#: apt-pkg/contrib/configuration.cc:700
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaxfel %s:%u: Inkluderad hrifrn"
@@ -2110,7 +2162,8 @@ msgstr "%c%s... Frdig"
msgid "Command line option '%c' [from %s] is not known."
msgstr "Kommandoradsflagga \"%c\" [frn %s] r ej knd."
-#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:106
+#: apt-pkg/contrib/cmndline.cc:114
#: apt-pkg/contrib/cmndline.cc:122
#, c-format
msgid "Command line option %s is not understood"
@@ -2121,12 +2174,14 @@ msgstr "Frstr inte kommandoradsflaggan %s"
msgid "Command line option %s is not boolean"
msgstr "Kommandoradsflaggan %s r inte boolsk"
-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
msgstr "Flaggan %s krver ett vrde."
-#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#: apt-pkg/contrib/cmndline.cc:201
+#: apt-pkg/contrib/cmndline.cc:207
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Flagga %s: Den angivna konfigurationsposten mste innehlla =<vrde>."
@@ -2157,7 +2212,9 @@ msgid "Unable to stat the mount point %s"
msgstr "Kunde inte ta status p monteringspunkt %s."
# Felmeddelande fr misslyckad chdir
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149
+#: apt-pkg/acquire.cc:427
+#: apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Kunde inte g till %s"
@@ -2305,7 +2362,8 @@ msgstr "valbart"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:60
+#: apt-pkg/depcache.cc:89
msgid "Building dependency tree"
msgstr "Bygger beroendetrd"
@@ -2357,7 +2415,8 @@ msgstr "Rad %lu i kllistan %s har fel format (dist-tolkning)"
msgid "Opening %s"
msgstr "ppnar %s"
-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220
+#: apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Rad %u fr lng i kllistan %s."
@@ -2372,22 +2431,16 @@ msgstr "Rad %u i kllistan %s har fel format (typ)"
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" r oknd p rad %u i listan ver kllor %s"
-#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#: apt-pkg/sourcelist.cc:252
+#: apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Rad %u i kllistan %s har fel format (leverantrs-id)"
#: apt-pkg/packagemanager.cc:402
#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Fr att genomfra denna installation mste det systemkritiska paketet %s "
-"tillflligt tas bort p grund av en beroendespiral i Conflicts/Pre-Depends. "
-"Detta r oftast en dlig id, men om du verkligen vill gra det kan du "
-"aktivera flaggan \"APT::Force-LoopBreak\"."
+msgid "This installation run will require temporarily removing the essential package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr "Fr att genomfra denna installation mste det systemkritiska paketet %s tillflligt tas bort p grund av en beroendespiral i Conflicts/Pre-Depends. Detta r oftast en dlig id, men om du verkligen vill gra det kan du aktivera flaggan \"APT::Force-LoopBreak\"."
#: apt-pkg/pkgrecords.cc:37
#, c-format
@@ -2396,18 +2449,12 @@ msgstr "Indexfiler av typ \"%s\" stds inte"
#: apt-pkg/algorithms.cc:241
#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Paketet %s mste installeras om, men jag kan inte hitta ngot arkiv fr det."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "Paketet %s mste installeras om, men jag kan inte hitta ngot arkiv fr det."
#: apt-pkg/algorithms.cc:1059
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p "
-"hllna paket."
+msgid "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages."
+msgstr "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p hllna paket."
#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
@@ -2561,7 +2608,8 @@ msgstr "Kunde inte ta status p kllkodspaketlistan %s"
msgid "Collecting File Provides"
msgstr "Samlar filberoenden"
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:785
+#: apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr "In-/utfel vid lagring av kllcache"
@@ -2570,35 +2618,31 @@ msgstr "In-/utfel vid lagring av kllcache"
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236
+#: apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumma stmmer inte"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Det finns ingen publik nyckel tillgnglig fr fljande nyckel-id:n:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du "
-"manuellt mste reparera detta paket (p grund av saknad arkitektur)."
+msgid "I wasn't able to locate a file for the %s package. This might mean you need to manually fix this package. (due to missing arch)"
+msgstr "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du manuellt mste reparera detta paket (p grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
-msgid ""
-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
-msgstr ""
-"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du "
-"manuellt mste reparera detta paket."
+msgid "I wasn't able to locate file for the %s package. This might mean you need to manually fix this package."
+msgstr "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du manuellt mste reparera detta paket."
-#: apt-pkg/acquire-item.cc:814
+#: 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 "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Storleken stmmer inte"
@@ -2616,7 +2660,8 @@ msgstr ""
"Anvnder cd-rom-monteringspunkt %s\n"
"Monterar cd-rom\n"
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+#: apt-pkg/cdrom.cc:516
+#: apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr "Identifierar.. "
@@ -2757,7 +2802,6 @@ msgstr "Frbindelsen stngdes i frtid"
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Okänt leverantörs-id \"%s\" på rad %u i källistan %s"
-
#~ msgid ""
#~ "Some broken packages were found while trying to process build-"
#~ "dependencies.\n"
@@ -2766,8 +2810,8 @@ msgstr "Frbindelsen stngdes i frtid"
#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan "
#~ "möjligen\n"
#~ "rätta detta genom att köra \"apt-get -f install\"."
-
#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
#~ msgstr ""
#~ "Beklagar, men du har inte tillräckligt ledigt utrymme på %s för att "
#~ "lagra alla .deb-filerna."
+
diff --git a/po/tl.po b/po/tl.po
index a7d843979..dc7c0d0ae 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-12-22 01:10+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -524,7 +524,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit na %sB tinamaan.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "Bigo ang pag-stat ng %s"
@@ -1098,7 +1098,7 @@ msgstr "Hindi mahanap ang paketeng source para sa %s"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
#: cmdline/apt-get.cc:1983
@@ -1686,12 +1686,12 @@ msgstr "Hindi nahanap ang Disk."
msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Bigo ang pag-stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Bigo ang pagtakda ng oras ng pagbago"
@@ -1819,7 +1819,7 @@ msgstr "Nag-timeout ang socket ng datos"
msgid "Unable to accept connection"
msgstr "Hindi makatanggap ng koneksyon"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema sa pag-hash ng talaksan"
@@ -1955,76 +1955,76 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s"
msgid "Read error from %s process"
msgstr "Error sa pagbasa mula sa prosesong %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Naghihintay ng mga header"
-#: methods/http.cc:527
+#: 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"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Maling linyang header"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "Sira ang range support ng HTTP server na ito"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Bigo ang pagpili"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error sa pagsulat ng talaksang output"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error sa pagsusulat sa talaksan"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Maling datos sa header"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Internal na error"
@@ -2578,11 +2578,15 @@ msgstr "IO Error sa pag-imbak ng source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2591,7 +2595,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2600,7 +2604,7 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2608,7 +2612,7 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "Di tugmang laki"
diff --git a/po/vi.po b/po/vi.po
index f656b2146..4c9841e03 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,99 +1,88 @@
-# Vietnamese Translation for apt.
+# Vietnamese Translation for Apt.
# This file is put in the public domain.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-04-30 16:05+0930\n"
+"POT-Creation-Date: 2006-01-20 14:06+0100\n"
+"PO-Revision-Date: 2006-01-22 13:04+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.6b30\n"
#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chưa có:\n"
+msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chưa có :\n"
#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
-msgstr "Không thể định vị gói %s."
+msgstr "Không thể định vị gói %s"
#: cmdline/apt-cache.cc:232
-#, fuzzy
msgid "Total package names : "
-msgstr "Tổng tên gói:"
+msgstr "Tổng tên gói: "
#: cmdline/apt-cache.cc:272
-#, fuzzy
msgid " Normal packages: "
msgstr " Gói bình thường: "
#: cmdline/apt-cache.cc:273
-#, fuzzy
msgid " Pure virtual packages: "
msgstr " Gói ảo nguyên chất: "
#: cmdline/apt-cache.cc:274
-#, fuzzy
msgid " Single virtual packages: "
msgstr " Gói ảo đơn: "
#: cmdline/apt-cache.cc:275
-#, fuzzy
msgid " Mixed virtual packages: "
-msgstr " Gói ảo pha trộn: "
+msgstr " Gói ảo đã pha trộn: "
#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr " Thiếu: "
#: cmdline/apt-cache.cc:278
-#, fuzzy
msgid "Total distinct versions: "
-msgstr "Tổng phiên bản riêng:"
+msgstr "Tổng phiên bản riêng: "
#: cmdline/apt-cache.cc:280
-#, fuzzy
msgid "Total dependencies: "
-msgstr "Tổng cách phụ thuộc:"
+msgstr "Tổng cách phụ thuộc: "
#: cmdline/apt-cache.cc:283
-#, fuzzy
msgid "Total ver/file relations: "
-msgstr "Tổng cách liên quan phiên bản và tập tin:"
+msgstr "Tổng cách liên quan phiên bản và tập tin: "
#: cmdline/apt-cache.cc:285
-#, fuzzy
msgid "Total Provides mappings: "
-msgstr "Tổng cách ảnh xạ miễn là:"
+msgstr "Tổng cách ảnh xạ Miễn là: "
#: cmdline/apt-cache.cc:297
-#, fuzzy
msgid "Total globbed strings: "
-msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm:"
+msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
#: cmdline/apt-cache.cc:311
-#, fuzzy
msgid "Total dependency version space: "
-msgstr "Tổng chỗ cho cách phụ thuộc vào phiên bản"
+msgstr "Tổng chỗ cho cách phụ thuộc vào phiên bản: "
#: cmdline/apt-cache.cc:316
-#, fuzzy
msgid "Total slack space: "
-msgstr "Tổng chỗ chưa dùng:"
+msgstr "Tổng chỗ chưa dùng: "
#: cmdline/apt-cache.cc:324
-#, fuzzy
msgid "Total space accounted for: "
-msgstr "Tổng chỗ sẽ dùng:"
+msgstr "Tổng chỗ sẽ dùng: "
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
@@ -102,21 +91,20 @@ msgstr "Tập tin gói %s không đồng bộ được."
#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
-msgstr "Bạn phải đưa ra đúng một mẫu riêng lẻ."
+msgstr "Bạn phải đưa ra đúng một mẫu"
#: cmdline/apt-cache.cc:1385
msgid "No packages found"
-msgstr "Không tìm thấy gói nào."
+msgstr "Không tìm thấy gói"
#: cmdline/apt-cache.cc:1462
-#, fuzzy
msgid "Package files:"
msgstr "Tập tin gói:"
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-"Bộ nhớ tạm không đồng bộ được nên không thể x-ref một tập tin gói nào đó."
+"Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói"
# Variable: do not translate/ biến: đừng dịch
#: cmdline/apt-cache.cc:1470
@@ -126,7 +114,6 @@ msgstr "%4i %s\n"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1482
-#, fuzzy
msgid "Pinned packages:"
msgstr "Các gói đã ghim:"
@@ -149,13 +136,11 @@ msgid " Candidate: "
msgstr " Ứng cử: "
#: cmdline/apt-cache.cc:1532
-#, fuzzy
msgid " Package pin: "
msgstr " Ghim gói: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1541
-#, fuzzy
msgid " Version table:"
msgstr " Bảng phiên bản:"
@@ -210,68 +195,64 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-"Cách sử dụng: apt-cache [tùy_chọn] lệnh\n"
-" apt-cache [tùy_chọn] add tập_tin1 [tập_tin2 ...]\n"
-" apt-cache [tùy_chọn] showpkg gói1 [gói2 ...]\n"
-" apt-cache [tùy_chọn] showsrc gói1 [gói2 ...]\n"
+"Cách sử dụng: apt-cache [tùy_chọn...] lệnh\n"
+" apt-cache [tùy_chọn...] add tập_tin1 [tập_tin2 ...]\n"
+" apt-cache [tùy_chọn...] showpkg gói1 [gói2 ...]\n"
+" apt-cache [tùy_chọn...] showsrc gói1 [gói2 ...]\n"
"(cache: \tbộ nhớ tạm;\n"
"add: \tthêm;\n"
"showpkg: hiển thị gói;\n"
"showsrc: \thiển thị nguồn)\n"
"\n"
-"apt-cache là một công cụ mức độ thấp được dùng để thao tác\n"
+"apt-cache là một công cụ mức thấp dùng để thao tác\n"
"những tập tin bộ nhớ tạm nhị phân của APT,\n"
-"và cũng để truy vấn thông tin từ những tập tin ấy.\n"
+"và cũng để truy vấn thông tin từ những tập tin đó.\n"
"\n"
"Lệnh:\n"
-" add\t\t_Thêm_ một gói nào đó vào bộ nhớ tạm nguồn\n"
-" gencaches\tXây dung (_tạo ra_) cả hai gói và _bộ nhớ tạm_ nguồn đều\n"
-" showpkg\t_Hiển thị_ một phần thông tin chung về một _gói_ riêng lẻ\n"
-" showsrc\t_Hiển thị_ các mục ghi _nguồn_\n"
-" stats\t\tHiển thị một phần _thống kê_ cơ bản\n"
-" dump\t\tHiển thị toàn tập tin dạng ngắn (_đổ_)\n"
+" add\t\t_Thêm_ gói vào bộ nhớ tạm nguồn\n"
+" gencaches\tXây dung (_tạo ra_) cả gói lẫn _bộ nhớ tạm_ nguồn đều\n"
+" showpkg\t_Hiện_ một phần thông tin chung về một _gói_ riêng lẻ\n"
+" showsrc\t_Hiện_ các mục ghi _nguồn_\n"
+" stats\t\tHiện một phần _thống kê_ cơ bản\n"
+" dump\t\tHiện toàn bộ tập tin dạng ngắn (_đổ_)\n"
" dumpavail\tIn ra một tập tin _sẵn sàng_ vào thiết bị xuất chuẩn (_đổ_)\n"
-" unmet\t\tHiển thị các cách phụ thuộc _chưa thực hiện_\n"
+" unmet\t\tHiện các cách phụ thuộc _chưa thực hiện_\n"
" search\t\t_Tìm kiếm_ mẫu biểu thức chính quy trong danh sách gói\n"
-" show\t\t_Hiển thị_ mục ghi có thể đọc, cho gói ấy\n"
-" depends\tHiển thị thông tin cách _phụ thuộc_ thô cho gói ấy\n"
-" rdepends\tHiển thị thông tin cách _phụ thuộc ngược lại_, cho gói ấy\n"
-" pkgnames\tHiển thị danh sách _tên_ mọi _gói_\n"
+" show\t\t_Hiệnị_ mục ghi có thể đọc, cho những gói đó\n"
+" depends\tHiện thông tin cách _phụ thuộc_ thô cho gói\n"
+" rdepends\tHiện thông tin cách _phụ thuộc ngược lại_, cho gói\n"
+" pkgnames\tHiện danh sách _tên_ mọi _gói_\n"
" dotty\t\tTạo ra đồ thị gói cho GraphVis (_nhiều chấm_)\n"
" xvcg\t\tTạo ra đồ thị gói cho _xvcg_\n"
" policy\t\tHiển thị các thiết lập _chính thức_\n"
"\n"
"Tùy chọn:\n"
" -h \t\t_Trợ giúp_ này\n"
-" -p=? \t\tBộ nhớ tạm của _gói_ ấy.\n"
+" -p=? \t\tBộ nhớ tạm _gói_.\n"
" -s=? \t\tBộ nhớ tạm _nguồn_.\n"
" -q \t\tTắt cái chỉ tiến trình (_im_).\n"
-" -i \t\tHiển thị chỉ những cách phụ thuộc _quan trọng_ cho lệnh chưa thực "
-"hiện.\n"
-" -c=? \t\tĐọc tập tin _cấu hình_ ấy\n"
-" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. -o dir::cache=/tmp\n"
-"Để tìm thông tin thêm thì bạn hãy xem hai trang «man» apt-cache(8) và apt."
-"conf(5).\n"
+" -i \t\tHiện chỉ những cách phụ thuộc _quan trọng_\n"
+"\t\t\tcho lệnh chưa thực hiện.\n"
+" -c=? \t\tĐọc tập tin _cấu hình_ này\n"
+" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
+"Để tìm thông tin thêm thì bạn hãy xem hai trang « man » (hướng dẫn)\n"
+"\t\t\tapt-cache(8) và apt.conf(5).\n"
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Hãy cung cấp tên cho Đĩa này, như « Debian 2.1r1 Đĩa 1 »"
#: cmdline/apt-cdrom.cc:93
-#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Chuyển đổi phương tiện: hãy nạp đĩa có nhãn\n"
-" '%s'\n"
-"vào ổ '%s' và bấm nút Enter\n"
+msgstr "Hãy nạp đĩa vào ổ và bấm nút Enter"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
-msgstr "Không có các đối số dạng cặp."
+msgstr "Không có các đối số dạng cặp"
#: cmdline/apt-config.cc:76
msgid ""
@@ -288,8 +269,10 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Cách sử dụng: apt-config [tùy_chọn] lệnh\n"
-"(config: viết tắt cho từ configuration: cấu hình)\n"
+"Cách sử dụng: apt-config [tùy_chọn...] lệnh\n"
+"\n"
+"[config: viết tắt cho từ configuration: cấu hình]\n"
+"\n"
"apt-config là một công cụ đơn giản để đọc tập tin cấu hình APT.\n"
"\n"
"Lệnh:\n"
@@ -298,8 +281,8 @@ msgstr ""
"\n"
"Tùy chọn:\n"
" -h \t\t_Trợ giúp_ này\n"
-" -c=? \t\tĐọc tập tin cấu hình ấy\n"
-" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. -o dir::cache=/tmp\n"
+" -c=? \t\tĐọc tập tin cấu hình này\n"
+" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
@@ -320,17 +303,19 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
"Cách sử dụng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
-"(extract: \t\trút;\n"
-"templates: \tnhững mẫu)\n"
-"apt-extracttemplates là một công cụ rút thông tin loại cấu hình và mẫu đều "
-"từ gói Debian\n"
+"\n"
+"[extract: \t\trút;\n"
+"templates: \tnhững biểu mẫu]\n"
+"\n"
+"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n"
+"\tvà biểu mẫu đều từ gói Debian\n"
"\n"
"Tùy chọn:\n"
" -h \t\t_Trợ giúp_ này\n"
-" -t \t\tLập thư muc tạm thời (temp, tmp: viết tắt cho từ temporary: tạm "
-"thời)\n"
-" -c=? \t\tĐọc tập tin cấu hình ấy\n"
-" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. -o dir::cache=/tmp\n"
+" -t \t\tLập thư muc tạm thời\n"
+"\t\t[temp, tmp: viết tắt cho từ « temporary »: tạm thời]\n"
+" -c=? \t\tĐọc tập tin cấu hình này\n"
+" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
@@ -339,31 +324,31 @@ msgstr "Không thể ghi vào %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Không thể gói phiên bản debconf. Có cài đăt debconf chưa?"
+msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
-msgstr "Danh sách mở rộng gói quá dài."
+msgstr "Danh sách mở rộng gói quá dài"
#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
-#, fuzzy, c-format
+#, c-format
msgid "Error processing directory %s"
-msgstr "Gặp lỗi khi xử lý thư mục %s."
+msgstr "Gặp lỗi khi xử lý thư mục %s"
#: ftparchive/apt-ftparchive.cc:254
msgid "Source extension list is too long"
-msgstr "Danh sách mở rộng nguồn quá dài."
+msgstr "Danh sách mở rộng nguồn quá dài"
#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
-msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung."
+msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung"
#: ftparchive/apt-ftparchive.cc:401
-#, fuzzy, c-format
+#, c-format
msgid "Error processing contents %s"
-msgstr "Gặp lỗi khi xử lý nội dung %s."
+msgstr "Gặp lỗi khi xử lý nội dung %s"
#: ftparchive/apt-ftparchive.cc:556
msgid ""
@@ -406,7 +391,9 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
-"Cách sử dụng: apt-ftparchive [tùy_chọn] lệnh\n"
+"Cách sử dụng: apt-ftparchive [tùy_chọn...] lệnh\n"
+"\n"
+"[ftparchive: FTP archive: kho FTP]\n"
"\n"
"Lệnh: \tpackages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n"
" \tsources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n"
@@ -414,7 +401,8 @@ msgstr ""
" \trelease path\n"
" \tgenerate config [groups]\n"
" \tclean config\n"
-"(packages: \tnhững gói;\n"
+"\n"
+"[packages: \tnhững gói;\n"
"binarypath: \tđường dẫn nhị phân;\n"
"sources: \t\tnhững nguồn;\n"
"srcpath: \t\tđường dẫn nguồn;\n"
@@ -430,19 +418,19 @@ msgstr ""
"\n"
"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n"
"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n"
-"cũng chứa băm MD5 và cỡ tập tin.\n"
+"cùng với băm MD5 và kích cỡ tập tin.\n"
"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n"
"\n"
"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n"
-"Có thể sử dụng tùy chọn --source-override (đè nguồn) để ghi rõ tập tin đè "
-"nguồn\n"
+"Có thể sử dụng tùy chọn « --source-override » (đè nguồn)\n"
+"để ghi rõ tập tin đè nguồn\n"
"\n"
-"Hãy chạy lệnh 'packages' (gói) và 'sources' (nguồn) tại gốc cây ấy.\n"
-"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của hành động tìm kiếm đệ "
+"Lnh « packages » (gói) và « sources » (nguồn) nên chạy tại gốc cây.\n"
+"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ "
"quy,\n"
"và tập tin đè nên chứa những cờ đè.\n"
-"Nếu có thì phụ thêm Pathprefix (tiền tố đường dẫn) vào những trường tên tập "
-"tin.\n"
+"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n"
+"những trường tên tập tin nếu có.\n"
"Cách sử dụng thí dụ từ kho Debian:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
@@ -455,17 +443,17 @@ msgstr ""
" -d=? \t\tChọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n"
" --no-delink \tMở chế độ gỡ lỗi _bỏ liên kết_\n"
" --contents \tĐiều khiển cách tạo ra tập tin _nội dung_\n"
-" -c=? \t\tĐọc tập tin cấu hình ấy\n"
-" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. -o dir::cache=/tmp"
+" -c=? \t\tĐọc tập tin cấu hình này\n"
+" -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »"
#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
-msgstr "Chưa khớp điều đã chọn nào."
+msgstr "Không có điều đã chọn khớp được"
#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr "Thiếu một số tập tin trong nhóm tập tin gói `%s'."
+msgstr "Thiếu một số tập tin trong nhóm tập tin gói « %s »."
#: ftparchive/cachedb.cc:45
#, c-format
@@ -475,7 +463,7 @@ msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tâp tin thành %
#: ftparchive/cachedb.cc:63
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s."
+msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s"
#: ftparchive/cachedb.cc:73
#, c-format
@@ -485,25 +473,25 @@ msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
#: ftparchive/cachedb.cc:114
#, c-format
msgid "File date has changed %s"
-msgstr "Ngày tập tin đã đổi rồi %s."
+msgstr "Ngày tập tin đã đổi %s"
#: ftparchive/cachedb.cc:155
msgid "Archive has no control record"
-msgstr "Kho không có mục ghi điều khiển nào."
+msgstr "Kho không có mục ghi điều khiển"
#: ftparchive/cachedb.cc:267
msgid "Unable to get a cursor"
-msgstr "Không thể gói con chạy nào."
+msgstr "Không thể lấy con chạy"
#: ftparchive/writer.cc:78
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr "W: Không thể đọc thư mục %s.\n"
+msgstr "W: Không thể đọc thư mục %s\n"
#: ftparchive/writer.cc:83
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "W: Không thể gói thông tin toàn bộ cho %s.\n"
+msgstr "W: Không thể lấy thông tin toàn bộ cho %s\n"
#: ftparchive/writer.cc:125
msgid "E: "
@@ -515,21 +503,21 @@ msgstr "W: "
#: ftparchive/writer.cc:134
msgid "E: Errors apply to file "
-msgstr "E: có lỗi áp dụng vào tập tin"
+msgstr "E: có lỗi áp dụng vào tập tin "
#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
#, c-format
msgid "Failed to resolve %s"
-msgstr "Không quyết định %s được."
+msgstr "Việc quyết định %s bị lỗi"
#: ftparchive/writer.cc:163
msgid "Tree walking failed"
-msgstr "Không di chuyển qua cây được."
+msgstr "Việc di chuyển qua cây bị lỗi"
#: ftparchive/writer.cc:188
#, c-format
msgid "Failed to open %s"
-msgstr "Không mở %s được."
+msgstr "Việc mở %s bị lỗi"
#: ftparchive/writer.cc:245
#, c-format
@@ -539,17 +527,17 @@ msgstr " Bỏ liên kết %s [%s]\n"
#: ftparchive/writer.cc:253
#, c-format
msgid "Failed to readlink %s"
-msgstr "Không tạo liên kết lại %s được."
+msgstr "Việc tạo liên kết lại %s bị lỗi"
#: ftparchive/writer.cc:257
#, c-format
msgid "Failed to unlink %s"
-msgstr "Không bỏ liên kết %s được."
+msgstr "Việc bỏ liên kết %s bị lỗi"
#: ftparchive/writer.cc:264
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Không liên kết %s đến %s được."
+msgstr "*** Việc liên kết %s đến %s bị lỗi"
#: ftparchive/writer.cc:274
#, c-format
@@ -557,19 +545,19 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " Hết hạn bỏ liên kết của %sB.\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
-msgstr "Không gọi thông tin toàn bộ cho %s được."
+msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi"
#: ftparchive/writer.cc:386
msgid "Archive had no package field"
-msgstr "Kho không có trường gói nào."
+msgstr "Kho không có trường gói"
#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
#, c-format
msgid " %s has no override entry\n"
-msgstr " %s không có mục ghi đè nào.\n"
+msgstr " %s không có mục ghi đè\n"
#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
#, c-format
@@ -577,78 +565,77 @@ msgid " %s maintainer is %s not %s\n"
msgstr " người bảo quản %s là %s không phải %s\n"
#: ftparchive/contents.cc:317
-#, fuzzy, c-format
+#, c-format
msgid "Internal error, could not locate member %s"
-msgstr "Gặp lỗi nội bộ, không thể định vị phần %s."
+msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn %s"
#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - không phân chia bộ nhớ được."
+msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi"
#: ftparchive/override.cc:38 ftparchive/override.cc:146
#, c-format
msgid "Unable to open %s"
-msgstr "Không thể mở %s."
+msgstr "Không thể mở %s"
#: ftparchive/override.cc:64 ftparchive/override.cc:170
#, c-format
msgid "Malformed override %s line %lu #1"
-msgstr "Điều đè dạng sai %s dòng %lu #1."
+msgstr "Điều đè dạng sai %s dòng %lu #1"
#: ftparchive/override.cc:78 ftparchive/override.cc:182
#, c-format
msgid "Malformed override %s line %lu #2"
-msgstr "Điều đè dạng sai %s dòng %lu #2."
+msgstr "Điều đè dạng sai %s dòng %lu #2"
#: ftparchive/override.cc:92 ftparchive/override.cc:195
#, c-format
msgid "Malformed override %s line %lu #3"
-msgstr "Điều đè dạng sai %s dòng %lu #3."
+msgstr "Điều đè dạng sai %s dòng %lu #3"
#: ftparchive/override.cc:131 ftparchive/override.cc:205
#, c-format
msgid "Failed to read the override file %s"
-msgstr "Không đọc tập tin đè %s được."
+msgstr "Việc đọc tập tin đè %s bị lỗi"
#: ftparchive/multicompress.cc:75
-#, fuzzy, c-format
+#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "Không biết thuật toán nén '%s'."
+msgstr "Không biết thuật toán nén « %s »"
#: ftparchive/multicompress.cc:105
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "Dữ liệu xuất đã nén %s cần một bộ nén."
+msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Không tạo ống IPC đến tiến trình con được."
+msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
#: ftparchive/multicompress.cc:198
msgid "Failed to create FILE*"
-msgstr "Không tạo TẬP_TIN* được."
+msgstr "Việc tạo TẬP_TIN* bị lỗi"
#: ftparchive/multicompress.cc:201
msgid "Failed to fork"
-msgstr "Không tạo tiến trình con được."
+msgstr "Việc tạo tiến trình con bị lỗi"
#: ftparchive/multicompress.cc:215
-#, fuzzy
msgid "Compress child"
-msgstr "Nén con."
+msgstr "Nén điều con"
#: ftparchive/multicompress.cc:238
-#, fuzzy, c-format
+#, c-format
msgid "Internal error, failed to create %s"
-msgstr "Lỗi nội bộ, không tạo %s được."
+msgstr "Lỗi nội bộ, việc tạo %s bị lỗi"
#: ftparchive/multicompress.cc:289
msgid "Failed to create subprocess IPC"
-msgstr "Không tạo tiến trình con IPC được."
+msgstr "Việc tạo tiến trình con IPC bị lỗi"
#: ftparchive/multicompress.cc:324
msgid "Failed to exec compressor "
-msgstr "Không thực hiện bô nén được."
+msgstr "Việc thực hiện bô nén bị lỗi "
#: ftparchive/multicompress.cc:363
msgid "decompressor"
@@ -656,60 +643,60 @@ msgstr "bộ giải nén"
#: ftparchive/multicompress.cc:406
msgid "IO to subprocess/file failed"
-msgstr "không gõ/xuất vào tiến trình con được"
+msgstr "việc nhập/xuất vào tiến trình con/tập tin bị lỗi"
#: ftparchive/multicompress.cc:458
msgid "Failed to read while computing MD5"
-msgstr "Không đọc được khi tính MD5."
+msgstr "Việc đọc khi tính MD5 bị lỗi"
#: ftparchive/multicompress.cc:475
#, c-format
msgid "Problem unlinking %s"
-msgstr "Gặp lỗi khi bỏ liên kết %s."
+msgstr "Gặp lỗi khi bỏ liên kết %s"
#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "Không đổi tên %s thành %s được."
+msgstr "Việc đổi tên %s thành %s bị lỗi"
#: cmdline/apt-get.cc:120
msgid "Y"
-msgstr "Y"
+msgstr "C"
#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
#, c-format
msgid "Regex compilation error - %s"
-msgstr "Lỗi biên dich biểu thức chính quy - %s."
+msgstr "Lỗi biên dich biểu thức chính quy - %s"
#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
-msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có:"
+msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có :"
#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
-msgstr "nhưng mà đã cài đặt %s rồi."
+msgstr "nhưng mà %s đã được cài đặt"
#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
-msgstr "nhưng mà sẽ cài %s."
+msgstr "nhưng mà %s sẽ được cài đặt"
#: cmdline/apt-get.cc:336
msgid "but it is not installable"
-msgstr "nhưng mà không thể càì nó."
+msgstr "nhưng mà nó không có khả năng cài đặt"
#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
-msgstr "nhưng mà nó là gói ảo."
+msgstr "nhưng mà nó là gói ảo"
#: cmdline/apt-get.cc:341
msgid "but it is not installed"
-msgstr "nhưng mà chưa cài nó."
+msgstr "nhưng mà nó chưa được cài đặt"
#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
-msgstr "nhưng mà sẽ không cài nó."
+msgstr "nhưng mà nó sẽ không được cài đặt"
#: cmdline/apt-get.cc:346
msgid " or"
@@ -717,15 +704,15 @@ msgstr " hay"
#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
-msgstr "Theo đây có những gói MỚI sẽ được cài:"
+msgstr "Theo đây có những gói MỚI sẽ được cài đặt:"
#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
-msgstr "Theo đây có những gói sẽ bị LOẠI BỎ:"
+msgstr "Theo đây có những gói sẽ bị GỠ BỎ :"
#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
-msgstr "Theo đây có những gói đã giữ lại:"
+msgstr "Theo đây có những gói đã được giữ lại:"
#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
@@ -733,7 +720,7 @@ msgstr "Theo đây có những gói sẽ được nâng cấp:"
#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
-msgstr "Theo đây có những gói sẽ bị HẠ CẤP:"
+msgstr "Theo đây có những gói sẽ được HẠ CẤP:"
#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
@@ -742,110 +729,106 @@ msgstr "Theo đây có những gói sẽ được thay đổi:"
#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
-msgstr "%s (do %s)"
+msgstr "%s (do %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 ""
-"CẢNH BÁO: theo đây có những gói chủ yếu sẽ bị loại bỏ.\n"
-"Đừng làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác."
+"CẢNH BÁO : theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n"
+"ĐỪNG làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác."
#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "Nâng cấp %lu, cài đặt mới %lu rồi."
+msgstr "%lu đã nâng cấp, %lu mới được cài đặt, "
#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
-msgstr "Cài đặt lại %lu gói rồi."
+msgstr "%lu được cài đặt lại, "
#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
-msgstr "Hạ cấp %lu gói rồi."
+msgstr "%lu được hạ cấp, "
#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "Có %lu gói cần loại bỏ, và chưa nâng cấp %lu gói.\n"
+msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr "Chưa cài đặt toàn bộ hay đã loại bỏ %lu.\n"
+msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
-msgstr "Sửa cách phụ thuộc..."
+msgstr "Đang sửa cách phụ thuộc..."
#: cmdline/apt-get.cc:652
msgid " failed."
-msgstr " thất bại.."
+msgstr " đã thất bại."
#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
-msgstr "Không thể sửa cách phụ thuộc."
+msgstr "Không thể sửa cách phụ thuộc"
#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
-msgstr "Không thể cực tiểu hóa bộ nâng cấp."
+msgstr "Không thể cực tiểu hóa bộ nâng cấp"
#: cmdline/apt-get.cc:660
msgid " Done"
-msgstr " Xong rồi."
+msgstr " Đã xong"
#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
-msgstr "Có lẽ bạn hãy chay lệnh `apt-get -f install' để sửa suốt."
+msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết."
#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr ""
-"Còn có phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy thử tùy chọn -f."
+"Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy "
+"chọn « -f »."
#: cmdline/apt-get.cc:689
-#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "Theo đây có những gói sẽ được nâng cấp:"
+msgstr "CẢNH BÁO : không thể xác thực những gói theo đây."
#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Cảnh báo xác thực bị đè.\n"
#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
-msgstr ""
+msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] "
#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
-msgstr ""
+msgstr "Một số gói không thể được xác thực"
#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
-msgstr "Gập lỗi thì đã dùng tùy chọn -y không có --force-yes."
+msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có « --force-yes »"
#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng."
#: cmdline/apt-get.cc:764
-#, fuzzy
msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"Cần phải loại bỏ một số gói, nhưng mà khả năng Loại bỏ (Remove) đã bị tắt."
+msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt."
#: cmdline/apt-get.cc:775
-#, fuzzy
msgid "Internal error, Ordering didn't finish"
-msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi."
+msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
-msgstr "Không thể khóa thư mục tải về."
+msgstr "Không thể khóa thư mục tải về"
#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
#: apt-pkg/cachefile.cc:67
@@ -855,31 +838,32 @@ msgstr "Không thể đọc danh sách nguồn."
#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
+"Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>"
#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Cần phải gói %sB/%sB kho.\n"
+msgstr "Cần phải lấy %sB/%sB kho.\n"
#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr "Cần phải gói %sB kho.\n"
+msgstr "Cần phải lấy %sB kho.\n"
#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Sau khi đã giải nén thì sẻ dùng %sB sức chứa đĩa thêm.\n"
+msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n"
#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Sau khi đã giải nén thì sẽ giải phóng %sB sức chữa đĩa thêm.\n"
+msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\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 "Không đủ sức chứa trong %s."
+msgstr "Không thể quyết định chỗ rảnh trong %s"
#: cmdline/apt-get.cc:849
#, c-format
@@ -889,21 +873,21 @@ msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s."
#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-"Xác đinh «Chỉ không đáng kể» (Trivial Only) nhưng mà thao tác này đáng kể."
+"Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể."
#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Có, làm đi."
#: 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 ""
"Bạn sắp làm gì có thể có hai.\n"
-"Để tiếp tục thì hãy gõ cụm từ '%s'\n"
+"Để tiếp tục thì hãy gõ cụm từ « %s »\n"
"?]"
#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
@@ -911,72 +895,67 @@ msgid "Abort."
msgstr "Hủy bỏ."
#: cmdline/apt-get.cc:889
-#, fuzzy
msgid "Do you want to continue [Y/n]? "
-msgstr "Bạn có muốn tiếp tục không? [Y/n] (Có/không)"
+msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "Không gói %s được %s\n"
+msgstr "Việc gói %s bị lỗi %s\n"
#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
-msgstr "Không tài một số tập tin về được."
+msgstr "Một số tập tin không tải về được"
#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
-msgstr "Tải về hoàn thành, trong chế độ chỉ tải về."
+msgstr "Mới tải về xong và trong chế độ chỉ tải về"
#: cmdline/apt-get.cc:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Không thể gọi một số kho, có lẽ hãy chạy lệnh:\n"
-"apt-get update\n"
-"(apt gọli cập nhật) hay thử với\n"
-"--fix-missing\n"
-"(sửa khi thiếu điều) không?"
+"Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy "
+"cập nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?"
#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-"Chưa hô trợ tùy chọn --fix-missing (sửa khi thiếu điều) và trao đổi phương "
-"tiện."
+"Chưa hô trợ tùy chọn « --fix-missing » (sửa khi thiếu điều) và trao đổi "
+"phương tiện."
#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
-msgstr "Không thể sửa khi thiếu những gói:"
+msgstr "Không thể sửa những gói còn thiếu."
#: cmdline/apt-get.cc:996
-#, fuzzy
msgid "Aborting install."
-msgstr "Đang hủy bỏ cài."
+msgstr "Đang hủy bỏ cài đặt."
#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
-msgstr "Ghi chú: đang chọn %s thay vì %s.\n"
+msgstr "Ghi chú : đang chọn %s thay vì %s\n"
#: cmdline/apt-get.cc:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Sẽ bỏ qua %s vì nó được cài và chưa lập tùy chọn Nâng cấp.\n"
+msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n"
#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "Chưa cài gói %s nên không thể loại bỏ nó.\n"
+msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n"
#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
-msgstr "Gói %s là gói ảo được cung cấp do:\n"
+msgstr "Gói %s là gói ảo được cung cấp do :\n"
#: cmdline/apt-get.cc:1081
msgid " [Installed]"
-msgstr "[Đã cài]"
+msgstr " [Đã cài đặt]"
#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
@@ -989,90 +968,85 @@ msgid ""
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"Gói %s không phải công bố, nhưng mà một gói khác đã tham chiếu đến nó.\n"
-"Có lẽ có nghĩa là thiếu gói ấy, nó trở thành cũ, hay chỉ công bố từ nguồn "
-"khác.\n"
+"Gói %s không phải sẵn sàng, nhưng mà một gói khác\n"
+"đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n"
+"đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n"
#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
-msgstr "Tuy nhiên, những gói theo đây có thay thế nó được:"
+msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
-msgstr "Gói %s không có ứng cử cài nào."
+msgstr "Gói %s không có ứng cử cài đặt"
#: cmdline/apt-get.cc:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Không thể cài lại %s vì không thể tải nó về.\n"
+msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n"
#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "%s là phiên bản mơi nhất rồi.\n"
+msgstr "%s là phiên bản mơi nhất.\n"
#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "Không tìm thấy bản đã phát hành '%s' cho '%s'."
+msgstr "Không tìm thấy bản phát hành « %s » cho « %s »"
#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr "Không tìm thấy phiên bản '%s' cho '%s'."
+msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
-msgstr "Đã chọn phiên bản %s (%s) cho %s.\n"
+msgstr "Đã chọn phiên bản %s (%s) cho %s\n"
#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
-msgstr "Lệnh cập nhật không chấp nhật đối số."
+msgstr "Lệnh cập nhật không chấp nhật đối số"
#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
-msgstr "Không thể khóa thư mục danh sách."
+msgstr "Không thể khóa thư mục danh sách"
#: cmdline/apt-get.cc:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"Không tải một số tập tin chỉ mục về được. Như thế thì đã bỏ qua chúng, hoặc "
-"đã dùng điều cũ hơn thay thế."
+"Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được "
+"dùng thay thế."
#: cmdline/apt-get.cc:1403
-#, fuzzy
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì."
+msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
-msgstr "Không tìm thấy gói %s."
+msgstr "Không tìm thấy gói %s"
#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Ghi chú: đang chọn %s cho biểu thức chính quy '%s'.\n"
+msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr ""
-"Có lẽ bạn hãy chạy lênh:\n"
-"apt-get -f install\n"
-"để sửa suốt."
+msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"Gói phụ thuộc vào phần mềm chưa có. Hãy thử lệnh:\n"
-"apt-get -f install\n"
-"còn không có gói nào (hoặc ghi rõ cách quyết định)."
+"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f "
+"install » mà không có gói nào (hoặc ghi rõ cách quyết định)."
#: cmdline/apt-get.cc:1570
msgid ""
@@ -1081,10 +1055,10 @@ msgid ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"Không thể cài một số gói. Có lẽ có nghĩa là bạn đa yêu cầu trường hợp không "
-"thể,\n"
-"hoặc nếu bạn sử dụng bản phân phối bất định thì có lẽ chưa tạo một số gói\n"
-"hay chưa di chuyển chúng ra Incoming (Đến)."
+"Không thể cài đặt một số gói. Có lẽ có nghĩa là bạn đa yêu cầu\n"
+"một trường hợp không thể, hoặc nếu bạn sử dụng bản phân phối\n"
+"bất định, có lẽ chưa tạo một số gói cần thiết,\n"
+"hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
#: cmdline/apt-get.cc:1578
msgid ""
@@ -1092,12 +1066,13 @@ msgid ""
"the package is simply not installable and a bug report against\n"
"that package should be filed."
msgstr ""
-"Vì bạn đã yêu cầu chỉ một thao tác riêng lẻ, thì rât có thể là không thể cài "
-"gói này, thì bạn hay thông báo lỗi cho <apt@packages.debian.org>."
+"Vì bạn đã yêu cầu chỉ một thao tác riêng lẻ, rât có thể là\n"
+"gói này đơn giản không có khả năng cài đặt, thì bạn hay\n"
+"thông báo lỗi về gói này."
#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
-msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định vấn đề này."
+msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
#: cmdline/apt-get.cc:1586
msgid "Broken packages"
@@ -1105,7 +1080,7 @@ msgstr "Gói bị ngắt"
#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
-msgstr "Sẽ cài những gói thêm theo đây:"
+msgstr "Những gói thêm theo đây sẽ được cài đặt:"
#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
@@ -1113,97 +1088,95 @@ msgstr "Gói được đệ nghị:"
#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
-msgstr "Gói được khuyến khích:"
+msgstr "Gói được khuyên:"
#: cmdline/apt-get.cc:1704
-#, fuzzy
msgid "Calculating upgrade... "
-msgstr "Tính nâng cấp..."
+msgstr "Đang tính nâng cấp... "
#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
-msgstr "Thất bại"
+msgstr "Bị lỗi"
#: cmdline/apt-get.cc:1712
msgid "Done"
-msgstr "Xong rồi"
+msgstr "Xong"
#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
-#, fuzzy
msgid "Internal error, problem resolver broke stuff"
-msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì."
+msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
-msgstr "Phải ghi rõ ít nhất một gói cần gọi nguồn cho nó:"
+msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
-msgstr "Không tìm thấy góio nguồn cho %s."
+msgstr "Không tìm thấy gói nguồn cho %s"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s.\n"
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
-msgstr "Không đủ sức chứa trong %s."
+msgstr "Không đủ sức chứa còn rảnh trong %s"
#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Cần phải gọi %sB/%sB kho nguồn.\n"
+msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "Cần phải gọi %sB kho nguồn.\n"
+msgstr "Cần phải lấy %sB kho nguồn.\n"
#: cmdline/apt-get.cc:1997
-#, fuzzy, c-format
+#, c-format
msgid "Fetch source %s\n"
-msgstr "Gọi nguồn %s\n"
+msgstr "Lấy nguồn %s\n"
#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
-msgstr "Không gọi một số kho được."
+msgstr "Việc lấy một số kho bị lỗi."
#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s.\n"
+msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr "Lệnh giải nén '%s' thất bại.\n"
+msgstr "Lệnh giải nén « %s » bị lỗi.\n"
#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "Lệnh xây dụng '%s' thất bại.\n"
+msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
#: cmdline/apt-get.cc:2105
msgid "Child process failed"
-msgstr "Tiến trình con thất bại."
+msgstr "Tiến trình con bị lỗi"
#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó."
+"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "Không thể gọi thông tin về cách phụ thuộc khi xây dụng cho %s."
+msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
#: cmdline/apt-get.cc:2169
#, c-format
@@ -1215,7 +1188,7 @@ msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-msgstr "%s phụ thuộc vào %s mà chưa có, vì không tìm thấy gọi %s."
+msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
#: cmdline/apt-get.cc:2273
#, c-format
@@ -1223,32 +1196,32 @@ msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"%s phụ thuộc vào %s mà chưa có, vì không có phiên bản công bố của gói %s có "
-"thể khớp với điều kiện phiên bản."
+"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
+"của gói %s có thể thỏa điều kiện phiên bản."
#: cmdline/apt-get.cc:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "%s phụ thuộc vào %s mà chưa có, vì gói đã cài %s quá mới."
+msgstr ""
+"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%s phụ thuộc vào %s mà chưa có: %s."
+msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s phụ thuộc vào phần mềm khi xây dụng mà không thể có."
+msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
-msgstr "Không xử lý cách phụ thuộc khi xây dụng được."
+msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
#: cmdline/apt-get.cc:2383
-#, fuzzy
msgid "Supported modules:"
-msgstr "Mô-đun đã hỗ trợ:"
+msgstr "Mô-đun đã hỗ trợ :"
#: cmdline/apt-get.cc:2424
msgid ""
@@ -1291,44 +1264,45 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"Cách sử dụng: apt-get [tùy_chọn] lệnh\n"
-" apt-get [tùy_chọn] install|remove gói1 [gói2 ...]\n"
-" apt-get [tùy_chọn] source gói1 [gói2 ...]\n"
+"Cách sử dụng: apt-get [tùy_chọn...] lệnh\n"
+" apt-get [tùy_chọn...] install|remove gói1 [gói2 ...]\n"
+" apt-get [tùy_chọn...] source gói1 [gói2 ...]\n"
"\n"
-"(get: \tgọi\n"
-"install: \tcài\n"
-"remove: \tloại bỏ\n"
-"source: \tnguồn)\n"
+"[get: \tlấy\n"
+"install: \tcài đặt\n"
+"remove: \tgỡ bỏ\n"
+"source: \tnguồn]\n"
"\n"
-"apt-get là một giao diện dòng lệnh đơn giản để tải về và cài gói. Những lệnh "
-"đã dùng thường nhất là update (cập nhật) và install (cài).\n"
+"apt-get là một giao diện dòng lệnh đơn giản để tải về và cài đặt gói.\n"
+"Những lệnh đã dùng thường nhất là update (cập nhật) và install (cài đặt).\n"
"\n"
"Lệnh:\n"
-" update\t\tGọi danh sách gói mới (_cập nhật_)\n"
+" update\t\tLấy danh sách gói mới (_cập nhật_)\n"
" upgrade \t_Nâng cập_ \n"
" install \t\t_Cài đặt_ gói mới (gói là libc6 không phải libc6.deb)\n"
-" remove \t_Loại bỏ_ gói\n"
+" remove \t_Gỡ bỏ_ gói\n"
" source \t\tTải về kho _nguồn_\n"
" build-dep \tĐịnh cấu hình _cách phụ thuộc khi xây dụng_, cho gói nguồn\n"
-" dist-upgrade \t_Nâng cấp bản phân phối_, hãy xem tài liệu apt-get(8)\n"
+" dist-upgrade \t_Nâng cấp bản phân phối_,\n"
+"\t\t\t\t\thãy xem trang hướng dẫn (man) apt-get(8)\n"
" dselect-upgrade \t\tTheo cách chọn dselect (_nâng cấp_)\n"
-" clean \t\tXóa bỏ các tập tin kho đã tải về (_sạch_)\n"
-" autoclean \tXóa bỏ các tập tin kho cũ đã tải về (_tự động sạch_)\n"
+" clean \t\tXóa bỏ các tập tin kho đã tải về (_làm sạch_)\n"
+" autoclean \tXóa bỏ các tập tin kho cũ đã tải về (_tự động làm sạch_)\n"
" check \t\t_Kiểm chứng_ không có cách phụ thuộc bị ngắt\n"
"\n"
"Tùy chọn:\n"
" -h \t_Trợ giúp_ này.\n"
-" -q \tDữ liệu xuất có thể ghi - không có cái chỉ tiến trình (_im_)\n"
+" -q \tDữ liệu xuất có thể ghi lưu - không có cái chỉ tiến trình (_im_)\n"
" -qq \tKhông xuất thông tin nào, trừ lỗi (_im im_)\n"
-" -d \tChỉ _tải về_, KHÔNG cài hay giản nén kho\n"
+" -d \tChỉ _tải về_, ĐỪNG cài đặt hay giải nén kho\n"
" -s \tKhông hoạt đông. _Mô phỏng_ sắp xếp\n"
-" -y \tGiả sử trả lời _Có_ (yes) mọi khi có câu hỏi; không nhắc người dùng "
-"gõ gì\n"
-" -f \t\tCố tiếp tục nếu kiểm tra sự hợp nhất _thất bại_\n"
-" -m \tCố tiếp tục nếu không thể định vị kho\n"
-" -u \tCũng hiển thị danh sách các gói đã _nâng cấp_\n"
-" -b \t_Xây dụng_ gói nguồn sau khi gọi nó\n"
-" -V \tHiển thị số _phiên bản chi tiết_\n"
+" -y \tGiả sử trả lời _Có_ (yes) mọi khi gặp câu hỏi;\n"
+"\t\t\t\t\tđừng nhắc người dùng gõ gì\n"
+" -f \t\tCố tiếp tục lại nếu việc kiểm tra tính nguyên vẹn _thất bại_\n"
+" -m \tCố tiếp tục lại nếu không thể định vị kho\n"
+" -u \tCũng hiện danh sách các gói đã _nâng cấp_\n"
+" -b \t_Xây dụng_ gói nguồn sau khi lấy nó\n"
+" -V \tHiện số thứ tự _phiên bản chi tiết_\n"
" -c=? \tĐọc tập tin cấu hình ấy\n"
" -o=? \tLập tùy chọn nhiệm ý, v.d. -o dir::cache=/tmp\n"
"Để tim thông tin và tùy chọn thêm thì hãy xem trang hướng dẫn apt-get(8), "
@@ -1337,24 +1311,24 @@ msgstr ""
#: cmdline/acqprogress.cc:55
msgid "Hit "
-msgstr "Lần tìm"
+msgstr "Lần tìm "
#: cmdline/acqprogress.cc:79
msgid "Get:"
-msgstr "Gọi:"
+msgstr "Lấy:"
#: cmdline/acqprogress.cc:110
msgid "Ign "
-msgstr "Bỏq"
+msgstr "Bỏq "
#: cmdline/acqprogress.cc:114
msgid "Err "
-msgstr "Lỗi"
+msgstr "Lỗi "
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Gọi %sB mất %s (%sB/s) rồi.\n"
+msgstr "Mới lấy %sB trong %s (%sB/g).\n"
#: cmdline/acqprogress.cc:225
#, c-format
@@ -1362,19 +1336,19 @@ msgid " [Working]"
msgstr " [Hoạt động]"
#: cmdline/acqprogress.cc:271
-#, fuzzy, c-format
+#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"Chuyển đổi phương tiện: hãy nạp đĩa có nhãn\n"
-" '%s'\n"
-"vào ổ '%s' và bấm nút Enter\n"
+"Chuyển đổi vật chứa: hãy nạp đĩa có nhãn\n"
+" « %s »\n"
+"vào ổ « %s » và bấm nút Enter\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
-msgstr "Không biết mục ghi gói ấy."
+msgstr "Không biết mục ghi gói."
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1389,16 +1363,18 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Cách sử dụng: apt-sortpkgs [tùy_chọn] tập_tin1 [tập_tin2 ...]\n"
+"Cách sử dụng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n"
+"\n"
+"[sortpkgs: sort packages: sắp xếp các gói]\n"
"\n"
"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
-"Tùy chon -s được dùng để ngụ ý kiểu tập tin\n"
+"Tùy chon « -s » dùng để ngụ ý kiểu tập tin.\n"
"\n"
"Tùy chọn:\n"
" -h \t_Trợ giúp_ này\n"
" -s \tSắp xếp những tập tin _nguồn_\n"
-" -c=? \tĐọc tập tin cấu hình ấy\n"
-" -o=? \tLập tùy chọn cấu hình nhiệm ý, v.d. -o dir::cache=/tmp\n"
+" -c=? \tĐọc tập tin cấu hình này\n"
+" -o=? \tLập tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
#: dselect/install:32
msgid "Bad default setting!"
@@ -1407,135 +1383,134 @@ msgstr "Thiết lập mặc định sai."
#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
#: dselect/install:104 dselect/update:45
msgid "Press enter to continue."
-msgstr "Hãy bấm phím Enter để tiếp tục."
+msgstr "Hãy bấm phím Enter để tiếp tục lại."
#: dselect/install:100
msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Gập một số lỗi khi giải nén. Sẽ định cấu hình"
+msgstr "Gập một số lỗi khi giải nén. Sẽ cấu hình"
#: dselect/install:101
msgid "packages that were installed. This may result in duplicate errors"
-msgstr "những gói đã cài đặt. Có lẽ sẽ gây ra những lỗi nhân bản"
+msgstr "những gói đã đươc cài đặt. Có lẽ sẽ gây ra lỗi trùng"
#: dselect/install:102
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "hoặc nhưng lỗi khi không có phần mềm mà gói khác phụ thuộc vào nó."
+msgstr ""
+"hoặc lỗi khi không có phần mềm mà gói khác phụ thuộc vào nó. Không có sao, "
+"chỉ những lỗi"
#: dselect/install:103
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-"Tùy nhiên, chỉ những lỗi ở trên thông điệp này là quan trọng.\n"
-"Hãy sửa chúng và chạy lại [I]nstall."
+"ở trên thông điệp này là quan trọng. Hãy sửa chúng và chạy lại [I]nstall "
+"(cài đặt)"
#: dselect/update:30
-#, fuzzy
msgid "Merging available information"
-msgstr "Đang hợp nhất các thông tin công bố"
+msgstr "Đang hợp nhất các thông tin sẵn sàng..."
#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
-msgstr "Không tạo những ống được."
+msgstr "Việc tạo những ống bị lỗi"
#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
-msgstr "Không thực hiện gzip được."
+msgstr "Việc thực hiện gzip bị lỗi "
#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Kho bị hỏng."
#: apt-inst/contrib/extracttar.cc:195
-#, fuzzy
msgid "Tar checksum failed, archive corrupted"
-msgstr "Tiến trình tar checksum thât bại: kho bị hỏng."
+msgstr "Tiến trình tar (kiểm tổng tar) thât bại: kho bị hỏng."
#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "Không biết kiểu phần đầu tar %u, mục thuộc %s"
+msgstr "Không biết kiểu phần đầu tar %u, bộ phạn %s"
#: apt-inst/contrib/arfile.cc:73
msgid "Invalid archive signature"
-msgstr "Chữ ký kho không hợp lệ."
+msgstr "Chữ ký kho không hợp lệ"
#: apt-inst/contrib/arfile.cc:81
msgid "Error reading archive member header"
-msgstr "Gặp lỗi khi đọc phần đầu mục thuộc kho."
+msgstr "Gặp lỗi khi đọc phần đầu bộ phạn kho"
#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
msgid "Invalid archive member header"
-msgstr "Phần đầu mục thuộc kho không hợp lê."
+msgstr "Phần đầu bộ phạn kho không hợp lê"
#: apt-inst/contrib/arfile.cc:131
msgid "Archive is too short"
-msgstr "Kho quá ngắn."
+msgstr "Kho quá ngắn"
#: apt-inst/contrib/arfile.cc:135
msgid "Failed to read the archive headers"
-msgstr "Không đọc phần đầu kho được."
+msgstr "Việc đọc phần đầu kho bị lỗi"
#: apt-inst/filelist.cc:384
msgid "DropNode called on still linked node"
-msgstr "Đã gọi DropNode (thả điểm nút) với điểm nút còn liên kết."
+msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết"
#: apt-inst/filelist.cc:416
msgid "Failed to locate the hash element!"
-msgstr "Không định vi phần tử băm được."
+msgstr "Việc định vi phần tử băm bị lỗi"
#: apt-inst/filelist.cc:463
msgid "Failed to allocate diversion"
-msgstr "Không phân chia sự trệch đi."
+msgstr "Việc cấp phát sự trệch đi bị lỗi"
#: apt-inst/filelist.cc:468
-#, fuzzy
msgid "Internal error in AddDiversion"
-msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)."
+msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)"
#: apt-inst/filelist.cc:481
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Đang cố ghi đè một sự trệch đi, %s -> %s và %s/%s."
+msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s"
#: apt-inst/filelist.cc:510
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr "Đã thêm sự trệch đi hai lần %s -> %s."
+msgstr "Sự trệch đi được thêm hai lần %s → %s"
#: apt-inst/filelist.cc:553
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr "Tập tin cấu hình nhân bản %s/%s."
+msgstr "Tập tin cấu hình trùng %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 "Không ghi vào tập tin %s được."
+msgstr "Việc ghi tập tin %s bị lỗi"
#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
-msgstr "Không đóng tập tin %s được."
+msgstr "Việc đóng tập tin %s bị lỗi"
#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
-msgstr "Đường dẫn %s quá dài."
+msgstr "Đường dẫn %s quá dài"
#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
-msgstr "Đang giải nén %s nhiều lần."
+msgstr "Đang giải nén %s nhiều lần"
#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
-msgstr "Thư mục %s đã làm trệch hướng."
+msgstr "Thư mục %s bị trệch hướng"
#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Gói đang cố ghi vào đích trệch đi %s/%s."
+msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s"
#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
@@ -1544,82 +1519,79 @@ msgstr "Đường dẫn trệch đi quá dài."
#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr "Thư mục %s do điều không phải là thư mục đang thay thế."
+msgstr "Thư mục %s đang được thay thế do điều không phải là thư mục"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
-msgstr "Không định vị điểm nút trong hộp băm nó."
+msgstr "Việc định vị điểm nút trong hộp băm nó bị lỗi"
#: apt-inst/extract.cc:287
msgid "The path is too long"
-msgstr "Đường dẫn quá dài."
+msgstr "Đường dẫn quá dài"
#: apt-inst/extract.cc:417
#, c-format
msgid "Overwrite package match with no version for %s"
-msgstr "Ghi đè lên gói đã khớp, với không có phiên bản cho %s."
+msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s"
#: apt-inst/extract.cc:434
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s."
+msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s"
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
-msgstr "Không thể đọc %s."
+msgstr "Không thể đọc %s"
#: apt-inst/extract.cc:494
#, c-format
msgid "Unable to stat %s"
-msgstr "Không thể gọi các thông tin về %s."
+msgstr "Không thể lấy các thông tin về %s"
#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
#, c-format
msgid "Failed to remove %s"
-msgstr "Không loại bỏ %s được."
+msgstr "Việc gỡ bỏ %s bị lỗi"
#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
#, c-format
msgid "Unable to create %s"
-msgstr "Không thể tạo %s."
+msgstr "Không thể tạo %s"
#: apt-inst/deb/dpkgdb.cc:118
#, c-format
msgid "Failed to stat %sinfo"
-msgstr "Không gọi các thông tin về %sinfo được."
+msgstr "Việc lấy các thông tin về %sinfo bị lỗi"
#: apt-inst/deb/dpkgdb.cc:123
msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
"Những thư mục info (thông tin) và temp (tạm thời) cần phải trong cùng một hệ "
-"thống tập tin."
+"thống tập tin"
#. 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
-#, fuzzy
msgid "Reading package lists"
-msgstr "Đang đọc các danh sách gói."
+msgstr "Đang đọc các danh sách gói..."
#: apt-inst/deb/dpkgdb.cc:180
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr "Không chuyển đổi tới thư mục quản lý %sinfo được."
+msgstr "Việc chuyển đổi sang thư mục quản lý %sinfo bị lỗi"
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
#: apt-inst/deb/dpkgdb.cc:448
-#, fuzzy
msgid "Internal error getting a package name"
-msgstr "Gặp lỗi nội bộ khi gọi tên gói."
+msgstr "Gặp lỗi nội bộ khi lấy tên gói"
#: apt-inst/deb/dpkgdb.cc:205
-#, fuzzy
msgid "Reading file listing"
-msgstr "Đang đọc danh sách tập tin."
+msgstr "Đang đọc danh sách tập tin..."
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
@@ -1628,27 +1600,26 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"Không mở tập tin danh sách '%sinfo/%s' được. Nếu bạn không thể phục hồi tập "
-"tin này, bạn hãy làm cho nó rỗng và ngay cài lại phiên bản gói ấy."
+"Việc mở tập tin danh sách « %sinfo/%s » bị lỗi. Nếu bạn không thể phục hồi "
+"tập tin này, bạn hãy làm cho nó rỗng và ngay cài đặt lại cùng phiên bản gói."
#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "Không đọc tập tin danh sách %sinfo/%s được."
+msgstr "Việc đọc tập tin danh sách %sinfo/%s bị lỗi"
#: apt-inst/deb/dpkgdb.cc:266
-#, fuzzy
msgid "Internal error getting a node"
-msgstr "Gặp lỗi nội bộ khi gọi nút điểm."
+msgstr "Gặp lỗi nội bộ khi lấy nút điểm..."
#: apt-inst/deb/dpkgdb.cc:309
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "Không mở tập tin trệch đi %sdiversions được."
+msgstr "Việc mở tập tin trệch đi %sdiversions bị lỗi"
#: apt-inst/deb/dpkgdb.cc:324
msgid "The diversion file is corrupted"
-msgstr "Tập tin trệch đi bị hỏng."
+msgstr "Tập tin trệch đi bị hỏng"
#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
#: apt-inst/deb/dpkgdb.cc:341
@@ -1657,84 +1628,77 @@ msgid "Invalid line in the diversion file: %s"
msgstr "Gặp dòng không hợp lệ trong tập tin trệch đi: %s"
#: apt-inst/deb/dpkgdb.cc:362
-#, fuzzy
msgid "Internal error adding a diversion"
-msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi."
+msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi"
#: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
msgid "The pkg cache must be initialized first"
-msgstr "Phải khởi động bộ nhớ tạm gói trước hết."
+msgstr "Phải khởi động bộ nhớ tạm gói trước hết"
#: apt-inst/deb/dpkgdb.cc:386
-#, fuzzy
msgid "Reading file list"
msgstr "Đang đọc danh sách tâp tin..."
#: apt-inst/deb/dpkgdb.cc:443
-#, fuzzy, c-format
+#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Không tìm thấy phần đầi Gói (Package) được, hiệu số %lu."
+msgstr "Lỗi tìm thấy Gói: phần đầu, hiệu số %lu"
#: apt-inst/deb/dpkgdb.cc:465
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
msgstr ""
-"Có phần cấu hình tập tin (ConfFile) sai trong tập tin trạng thái. Hiệu số %"
-"lu."
+"Có phần cấu hình tập tin (ConfFile) sai trong tập tin trạng thái. Hiệu số %lu"
#: apt-inst/deb/dpkgdb.cc:470
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu."
+msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu"
#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Đây không phải là môt kho DEB hợp lệ vì thiếu phần '%s'."
+msgstr "Đây không phải là môt kho DEB hợp lệ vì còn thiếu bộ phạn « %s »"
#: apt-inst/deb/debfile.cc:52
-#, fuzzy, c-format
+#, c-format
msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "Đây không phải là môt kho DEB hợp lệ vì thiếu phần '%s'."
+msgstr ""
+"Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s » hay « %s »"
#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
-msgstr "Không thể thay đổi thành %s."
+msgstr "Không thể chuyển đổi sang %s"
#: apt-inst/deb/debfile.cc:138
-#, fuzzy
msgid "Internal error, could not locate member"
-msgstr "Gặp lỗi nội bộ, không thể định vị phần."
+msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn"
#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
-msgstr "Không định vị tập tin điều khiển hợp lệ được."
+msgstr "Việc định vị tập tin điều khiển hợp lệ bị lỗi"
#: apt-inst/deb/debfile.cc:256
-#, fuzzy
msgid "Unparsable control file"
-msgstr "Tập tin điều khiển không thể phân tách."
+msgstr "Tập tin điều khiển không có khả năng phân tách"
#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "Không thể đọc cơ sở dữ liệu đĩa CD-ROM %s."
+msgstr "Không thể đọc cơ sở dữ liệu đĩa CD-ROM %s"
#: methods/cdrom.cc:123
-#, fuzzy
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-"Hãy sử dụng lệnh apt-cdrom để làm cho APT chấp nhận đĩa CD này. Không thể sử "
-"dụng lệnh apt-get update (gọi cập nhật) để thêm đĩa CD mới nào."
+"Hãy sử dụng lệnh « apt-cdrom » để làm cho APT chấp nhận đĩa CD này. Không "
+"thể sử dụng lệnh « apt-get update » (lấy cập nhật) để thêm đĩa CD mới."
#: methods/cdrom.cc:131
-#, fuzzy
msgid "Wrong CD-ROM"
-msgstr "Không phải đĩa CD đúng."
+msgstr "CD không đúng"
#: methods/cdrom.cc:164
#, c-format
@@ -1742,81 +1706,79 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Không thể tháo gắn kết đĩa CD-ROM trong %s. Có lẽ nó còn dùng."
#: methods/cdrom.cc:169
-#, fuzzy
msgid "Disk not found."
-msgstr "Không tìm thấy tập tin."
+msgstr "Không tìm thấy đĩa"
#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
-msgstr "Không tìm thấy tập tin."
+msgstr "Không tìm thấy tập tin"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
-msgstr "Không gọi các thông tin được."
+msgstr "Việc lấy các thông tin bị lỗi"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
-msgstr "Không lập giờ sửa đổi được."
+msgstr "Việc lập giờ sửa đổi bị lỗi"
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
-msgstr "Địa chỉ Mạng không hợp lệ: không thể bắt đầu địa chỉ Mạng bằng //"
+msgstr "Địa chỉ Mạng (URI) không hợp lệ: URI không thể bắt đầu với « // »"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:162
msgid "Logging in"
-msgstr "Đang đăng nhập"
+msgstr "Đang đăng nhập..."
#: methods/ftp.cc:168
msgid "Unable to determine the peer name"
-msgstr "Không thể quyết định tên ngang hàng."
+msgstr "Không thể quyết định tên ngang hàng"
#: methods/ftp.cc:173
msgid "Unable to determine the local name"
-msgstr "Không thể quyết định tên cục bộ."
+msgstr "Không thể quyết định tên cục bộ"
#: methods/ftp.cc:204 methods/ftp.cc:232
-#, fuzzy, c-format
+#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "Máy chủ từ chối kết nối với chúng tôi, và nói: %s."
+msgstr "Máy phục vụ đã từ chối kết nối, và nói: %s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr "Lệnh USER (người dùng) thất bại: máy chủ nói: %s."
+msgstr "Lệnh USER (người dùng) đã thất bại: máy phục vụ nói: %s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "Lệnh PASS (mật khẩu) thất bại: máy chủ nói: %s."
+msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy phục vụ nói: %s"
#: methods/ftp.cc:237
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"Đã ghi rõ máy chủ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập.\n"
-"Acquire::ftp::ProxyLogin\n"
-"là rỗng."
+"Đã ghi rõ máy phục vụ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập. « "
+"Acquire::ftp::ProxyLogin » là rỗng."
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "Lệnh tập lệnh đăng nhập '%s' thất bại: máy chủ nói: %s."
+msgstr "Lệnh tập lệnh đăng nhập « %s » đã thất bại: máy phục vụ nói: %s"
#: methods/ftp.cc:291
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "Lệnh TYPE (kiểu) thất bại: máy chủ nói: %s."
+msgstr "Lệnh TYPE (kiểu) đã thất bại: máy phục vụ nói: %s"
#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
-msgstr "Kết nối thời hạn"
+msgstr "Thời hạn kết nối"
#: methods/ftp.cc:335
msgid "Server closed the connection"
-msgstr "Máy chủ đã đóng kết nối này rồi."
+msgstr "Máy phục vụ đã đóng kết nối"
#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
msgid "Read error"
@@ -1824,11 +1786,11 @@ msgstr "Lỗi đọc"
#: methods/ftp.cc:345 methods/rsh.cc:197
msgid "A response overflowed the buffer."
-msgstr "Một trả lời đã tràn bộ đệm rồi."
+msgstr "Một trả lời đã tràn bộ đệm."
#: methods/ftp.cc:362 methods/ftp.cc:374
msgid "Protocol corruption"
-msgstr "Giao thức bị hỏng."
+msgstr "Giao thức bị hỏng"
#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
msgid "Write error"
@@ -1836,11 +1798,11 @@ msgstr "Lỗi ghi"
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
msgid "Could not create a socket"
-msgstr "Không thể tạo ổ cắm."
+msgstr "Không thể tạo ổ cắm"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr "Không thể kết nối ổ cắm dỡ liệu, kết nối thời hạn rồi."
+msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1848,59 +1810,59 @@ msgstr "Không thể kết nối ổ cắm bị động."
#: methods/ftp.cc:722
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo (gọi thông tin địa chỉ) không thể lấy ổ cắm nghe."
+msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe"
#: methods/ftp.cc:736
msgid "Could not bind a socket"
-msgstr "Không thể đóng kết ổ cắm."
+msgstr "Không thể đóng kết ổ cắm"
#: methods/ftp.cc:740
msgid "Could not listen on the socket"
-msgstr "Không thể lắng nghe trên ổ cắm ấy."
+msgstr "Không thể lắng nghe trên ổ cắm đó"
#: methods/ftp.cc:747
msgid "Could not determine the socket's name"
-msgstr "Không thể quyết định tên ổ cắm ấy."
+msgstr "Không thể quyết định tên ổ cắm đó"
#: methods/ftp.cc:779
msgid "Unable to send PORT command"
-msgstr "Không thể gởi lệnh PORT (cổng)."
+msgstr "Không thể gởi lệnh PORT (cổng)"
#: methods/ftp.cc:789
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr "Không biết nhóm địa chỉ %u (AF_*)."
+msgstr "Không biết nhóm địa chỉ %u (AF_*)"
#: methods/ftp.cc:798
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "Lệnh EPRT (thông báo lỗi) thất bại: máy chủ nói: %s."
+msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy phục vụ nói: %s"
#: methods/ftp.cc:818
msgid "Data socket connect timed out"
-msgstr "Kết nối ổ cắm dữ liệu thời hạn rồi."
+msgstr "Kết nối ổ cắm dữ liệu đã quá giờ"
#: methods/ftp.cc:825
msgid "Unable to accept connection"
-msgstr "Không thể chấp nhận kết nối."
+msgstr "Không thể chấp nhận kết nối"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "Gặp khó khi băm tập tin."
+msgstr "Gặp khó khăn băm tập tin"
#: methods/ftp.cc:877
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Không thể gọi tập tin: máy chủ nói '%s'."
+msgstr "Không thể lấy tập tin: máy phục vụ nói « %s »"
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
-msgstr "Ổ cắm dữ liệu thời hạn rồi."
+msgstr "Ổ cắm dữ liệu đã quá giờ"
#: methods/ftp.cc:922
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Không chuyển dữ liệu được: máy chủ nói '%s'."
+msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói « %s »"
#. Get the files information
#: methods/ftp.cc:997
@@ -1914,7 +1876,7 @@ msgstr "Không thể gọi "
#: methods/connect.cc:64
#, c-format
msgid "Connecting to %s (%s)"
-msgstr "Đang kết nối đến %s (%s)."
+msgstr "Đang kết nối đến %s (%s)..."
#: methods/connect.cc:71
#, c-format
@@ -1924,17 +1886,17 @@ msgstr "[Địa chỉ IP: %s %s]"
#: methods/connect.cc:80
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)."
+msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)"
#: methods/connect.cc:86
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Không thể khởi động kết nối đến %s:%s (%s)."
+msgstr "Không thể sở khởi kết nối đến %s:%s (%s)."
#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Không thể kết nối đến %s:%s (%s), kết nối thời hạn rồi."
+msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ"
#: methods/connect.cc:106
#, c-format
@@ -1946,22 +1908,22 @@ msgstr "Không thể kết nối đến %s:%s (%s)."
#: methods/connect.cc:134 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
-msgstr "Đang kết nối đến %s."
+msgstr "Đang kết nối đến %s..."
#: methods/connect.cc:165
#, c-format
msgid "Could not resolve '%s'"
-msgstr "Không thể tháo gỡ '%s'."
+msgstr "Không thể tháo gỡ « %s »"
#: methods/connect.cc:171
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "Không tháo gỡ '%s' được tạm thời."
+msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời"
#: methods/connect.cc:174
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ '%s:%s' (%i)"
+msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)"
#: methods/connect.cc:221
#, c-format
@@ -1970,163 +1932,156 @@ msgstr "Không thể kết nối đến %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
#: methods/gpgv.cc:191
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Gặp ít nhất một chữ ký không hợp lệ."
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "Không thể gọi khóa %s."
+msgstr "Không thể thực hiện "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " để kiểm chứng chữ ký (gnupg có được cài đặt chưa?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Gặp lỗi lạ khi thực hiện gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "Sẽ cài những gói thêm theo đây:"
+msgstr "Những chữ ký theo đây là không hợp lệ:\n"
#: methods/gpgv.cc:244
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn sàng:\n"
#: methods/gzip.cc:57
#, c-format
msgid "Couldn't open pipe for %s"
-msgstr "Không thể mở ống cho %s."
+msgstr "Không thể mở ống dẫn cho %s"
#: methods/gzip.cc:102
#, c-format
msgid "Read error from %s process"
-msgstr "Gặp lỗi đọc từ tiến trình %s."
+msgstr "Gặp lỗi đọc từ tiến trình %s"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
-msgstr "Đang đợi những phần đầu."
+msgstr "Đang đợi những phần đầu..."
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "Đã gọi một dòng đầu riêng lẻ chứa hơn %u ky tự."
+msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
-msgstr "Dòng đầu sai."
+msgstr "Dòng đầu sai"
-#: methods/http.cc:554 methods/http.cc:561
-#, fuzzy
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
-msgstr "Máy chủ http đã gởi một dòng đầu trả lời không hợp lệ."
+msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ"
-#: methods/http.cc:590
-#, fuzzy
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-"Máy chủ http đã gởi một dòng đầu Độ dài nội dụng (Content-Length) không hợp "
-"lệ."
+"Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
+"hợp lệ"
-#: methods/http.cc:605
-#, fuzzy
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-"Máy chủ http đã gởi một dòng đầu Phạm vị nội dụng (Content-Range) không hợp "
-"lệ."
+"Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
+"hợp lệ"
-#: methods/http.cc:607
-#, fuzzy
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
-msgstr "Máy chủ http này có sự hỗ trơ phạm vị bị ngắt."
+msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
-msgstr "Không biết dạng ngày ấy."
+msgstr "Không biết dạng ngày"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
-msgstr "Không chọn được."
+msgstr "Việc chọn bị lỗi"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
-msgstr "Kết nối đã thời hạn rồi."
+msgstr "Kết nối đã quá giờ"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
-msgstr "Gặp lỗi khi ghi vào tập tin xuất."
+msgstr "Gặp lỗi khi ghi vào tập tin xuất"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
-msgstr "Gặp lỗi khi ghi vào tập tin."
+msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
-msgstr "Gặp lỗi khi ghi vào tập tin ấy."
+msgstr "Gặp lỗi khi ghi vào tập tin đó"
-#: methods/http.cc:879
-#, fuzzy
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
-msgstr "Gặp lỗi khi đọc từ máy chủ: cuối cùng ở xa đã đóng kết nối rồi."
+msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
-msgstr "Gặp lỗi khi đọc từ máy chủ."
+msgstr "Gặp lỗi khi đọc từ máy phục vụ"
-#: methods/http.cc:1112
-#, fuzzy
+#: methods/http.cc:1107
msgid "Bad header data"
-msgstr "Dữ liệu dòng đầu sai."
+msgstr "Dữ liệu dòng đầu sai"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
-msgstr "Không kết nối được."
+msgstr "Kết nối bị ngắt"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
-msgstr "Gặp lỗi nội bộ."
+msgstr "Gặp lỗi nội bộ"
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
-msgstr "Không thể mmap (ảnh xạ bộ nhớ) một tâp tin rỗng."
+msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng"
#: apt-pkg/contrib/mmap.cc:87
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) của %lu byte."
+msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
-msgstr "Không tìm thấy điều đã chọn %s."
+msgstr "Không tìm thấy vùng chọn %s"
#: apt-pkg/contrib/configuration.cc:436
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Không nhận biết viết tắt kiểu: '%c'"
+msgstr "Không nhận biết viết tắt kiểu: « %c »"
#: apt-pkg/contrib/configuration.cc:494
#, c-format
msgid "Opening configuration file %s"
-msgstr "Đang mở tập tin cấu hình %s."
+msgstr "Đang mở tập tin cấu hình %s..."
#: apt-pkg/contrib/configuration.cc:512
#, c-format
msgid "Line %d too long (max %d)"
-msgstr "Dòng %d quá dài (%d tối đa)."
+msgstr "Dòng %d quá dài (tối đa %d)"
#: apt-pkg/contrib/configuration.cc:608
#, c-format
@@ -2134,39 +2089,39 @@ msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên."
#: apt-pkg/contrib/configuration.cc:627
-#, fuzzy, c-format
+#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai."
+msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai"
#: apt-pkg/contrib/configuration.cc:644
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị."
+msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị"
#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đỉnh."
+msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu"
#: apt-pkg/contrib/configuration.cc:691
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau."
+msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau"
#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây."
+msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây"
#: apt-pkg/contrib/configuration.cc:704
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị '%s'."
+msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »"
#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thức tập tin."
+msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin"
#: apt-pkg/contrib/progress.cc:154
#, c-format
@@ -2176,25 +2131,23 @@ msgstr "%c%s... Lỗi."
#: apt-pkg/contrib/progress.cc:156
#, c-format
msgid "%c%s... Done"
-msgstr "%c%s... Xong rồi."
+msgstr "%c%s... Xong"
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "Không biết tùy chọn dòng lệnh '%c' [từ %s]."
+msgstr "Không biết tùy chọn dòng lệnh « %c » [từ %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 "Không hiểu tùy chọn dòng lệnh %s."
+msgstr "Không hiểu tùy chọn dòng lệnh %s"
#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
-msgstr ""
-"Tùy chọn dòng lệnh %s không phải boolean (chỉ có hai trả lời: thật và không "
-"thật)."
+msgstr "Tùy chọn dòng lệnh %s không phải bun (đúng/không đúng)"
#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
@@ -2204,67 +2157,66 @@ msgstr "Tùy chọn %s cần đến một đối số."
#: 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 "Tùy chọn %s: lời ghi rõ mục cấu hình phải có một =<val>."
+msgstr "Tùy chọn %s: đặc tả mục cấu hình phải có một « =<giá_trị> »."
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Tùy chọn %s cần đến một đối số số nguyên, không phải '%s'."
+msgstr "Tùy chọn %s cần đến một đối số số nguyên, không phải « %s »"
#: apt-pkg/contrib/cmndline.cc:268
#, c-format
msgid "Option '%s' is too long"
-msgstr "Tùy chọn %s quá dài."
+msgstr "Tùy chọn « %s » quá dài"
#: apt-pkg/contrib/cmndline.cc:301
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr ""
-"Không hiểu %s có nghĩa nào: hãy thử true (thật) hay false (không thật)."
+msgstr "Không hiểu %s: hãy cố dùng true (đúng) hay false (không đúng)."
#: apt-pkg/contrib/cmndline.cc:351
#, c-format
msgid "Invalid operation %s"
-msgstr "Thao tác không hợp lệ %s."
+msgstr "Thao tác không hợp lệ %s"
#: apt-pkg/contrib/cdromutl.cc:55
#, c-format
msgid "Unable to stat the mount point %s"
-msgstr "Không thể gọi các thông tin cho điểm gắn kết %s."
+msgstr "Không thể lấy các thông tin cho điểm gắn kết %s"
#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
-msgstr "Không thể thay đổi thành %s."
+msgstr "Không thể chuyển đổi sang %s"
#: apt-pkg/contrib/cdromutl.cc:190
msgid "Failed to stat the cdrom"
-msgstr "Không gọi cac thông tin cho đĩa CD-ROM được."
+msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi"
#: apt-pkg/contrib/fileutl.cc:82
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s."
+msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s"
#: apt-pkg/contrib/fileutl.cc:87
#, c-format
msgid "Could not open lock file %s"
-msgstr "Không thể mở tập tin khóa %s."
+msgstr "Không thể mở tập tin khóa %s"
#: apt-pkg/contrib/fileutl.cc:105
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Không dùng khả năng khóa cho tập tin khóa đã gắn kết kiểu NFS %s."
+msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s"
#: apt-pkg/contrib/fileutl.cc:109
#, c-format
msgid "Could not get lock %s"
-msgstr "Không thể gọi khóa %s."
+msgstr "Không thể lấy khóa %s"
#: apt-pkg/contrib/fileutl.cc:377
-#, fuzzy, c-format
+#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr "Đã đợi %s nhưng mà chưa gặp nó."
+msgstr "Đã đợi %s nhưng mà chưa gặp nó"
#: apt-pkg/contrib/fileutl.cc:387
#, c-format
@@ -2274,22 +2226,22 @@ msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn."
#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr "Tiến trình con %s đã trả lời một mã lỗi (%u)."
+msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)"
#: apt-pkg/contrib/fileutl.cc:392
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr "Tiến trình con %s đã thoát bất ngờ."
+msgstr "Tiến trình con %s đã thoát bất ngờ"
#: apt-pkg/contrib/fileutl.cc:436
#, c-format
msgid "Could not open file %s"
-msgstr "Không thể mở tập tin %s."
+msgstr "Không thể mở tập tin %s"
#: apt-pkg/contrib/fileutl.cc:492
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "đọc, còn cần đọc %lu nhưng mà không có điều nào còn lại."
+msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại"
#: apt-pkg/contrib/fileutl.cc:522
#, c-format
@@ -2298,40 +2250,40 @@ msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
#: apt-pkg/contrib/fileutl.cc:597
msgid "Problem closing the file"
-msgstr "Gặp lỗi khi đóng tập tin ấy."
+msgstr "Gặp lỗi khi đóng tập tin đó"
#: apt-pkg/contrib/fileutl.cc:603
msgid "Problem unlinking the file"
-msgstr "Gặp lỗi khi bỏ liên kết tập tin ấy."
+msgstr "Gặp lỗi khi bỏ liên kết tập tin đó"
#: apt-pkg/contrib/fileutl.cc:614
msgid "Problem syncing the file"
-msgstr "Gặp lỗi khi đồng bộ hóa tập tin ấy."
+msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó"
#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
-msgstr "Bộ nhớ tạm gói rỗng."
+msgstr "Bộ nhớ tạm gói rỗng"
#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
-msgstr "Tập tin bộ nhớ tạm gói bị hỏng."
+msgstr "Tập tin bộ nhớ tạm gói bị hỏng"
#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
-msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tương thích."
+msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tương thích"
#: apt-pkg/pkgcache.cc:142
-#, fuzzy, c-format
+#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "Trình APT này không hỗ trợ hệ thống điều khiểm phiên bản '%s'."
+msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản « %s »"
#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
-msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác."
+msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác"
#: apt-pkg/pkgcache.cc:218
msgid "Depends"
-msgstr "Phụ thuộc "
+msgstr "Phụ thuộc"
#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
@@ -2343,7 +2295,7 @@ msgstr "Đệ nghị"
#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
-msgstr "Khuyến khích"
+msgstr "Khuyên"
#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
@@ -2355,7 +2307,7 @@ msgstr "Thay thế"
#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
-msgstr "Làm cho cũ"
+msgstr "Làm cũ"
#: apt-pkg/pkgcache.cc:231
msgid "important"
@@ -2375,37 +2327,34 @@ msgstr "tùy chọn"
#: apt-pkg/pkgcache.cc:232
msgid "extra"
-msgstr "nữa"
+msgstr "thêm"
#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-#, fuzzy
msgid "Building dependency tree"
-msgstr "Đang xây dụng cây cách phụ thuộc."
+msgstr "Đang xây dụng cây cách phụ thuộc..."
#: apt-pkg/depcache.cc:61
-#, fuzzy
msgid "Candidate versions"
msgstr "Phiên bản ứng cử"
#: apt-pkg/depcache.cc:90
-#, fuzzy
msgid "Dependency generation"
-msgstr "Tạo cách phụ thuộc"
+msgstr "Tạo ra cách phụ thuộc"
#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr "Không thể phân tách tập tin gói %s (1)."
+msgstr "Không thể phân tách tập tin gói %s (1)"
#: apt-pkg/tagfile.cc:160
#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr "Không thể phân tách tập tin gói %s (2)."
+msgstr "Không thể phân tách tập tin gói %s (2)"
#: apt-pkg/sourcelist.cc:94
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ Mạng)."
+msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ Mạng)"
#: apt-pkg/sourcelist.cc:96
#, c-format
@@ -2419,16 +2368,16 @@ msgstr ""
"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ Mạng)."
#: apt-pkg/sourcelist.cc:105
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-"Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)."
+"Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)."
+"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)"
#: apt-pkg/sourcelist.cc:203
#, c-format
@@ -2448,12 +2397,12 @@ msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)."
#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Không biết kiểu '%s' trên dòng %u trong danh sách nguồn %s."
+msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s."
#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)."
+msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)"
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2462,14 +2411,15 @@ msgid ""
"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 ""
-"Chạy tiến trình cài đặt này sẽ cần thiết loại bỏ gói chủ yếu %s tạm thời, do "
-"vong lăp Xung đột/Phụ thuộc trước. Làm như thế thường xấu, nhưng mà nếu bạn "
-"thật sự muốn tiếp tục thì có thể hoạt hóa tuy chọn APT::Force-LoopBreak."
+"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do "
+"vong lăp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu "
+"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn « APT::Force-LoopBreak "
+"» (buộc ngắt vòng lặp)."
#: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr "Không hỗ trợ kiểu tập tin chỉ mục '%s'."
+msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »"
#: apt-pkg/algorithms.cc:241
#, c-format
@@ -2482,8 +2432,8 @@ msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Lỗi: pkgProblemResolver::Resolve (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo ra "
-"nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này."
+"Lỗi: « pkgProblemResolver::Resolve » (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo "
+"ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này."
#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
@@ -2492,22 +2442,22 @@ msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói b
#: apt-pkg/acquire.cc:62
#, c-format
msgid "Lists directory %spartial is missing."
-msgstr "Thiếu thư mục danh sách %spartial."
+msgstr "Thiếu thư mục danh sách « %spartial »."
#: apt-pkg/acquire.cc:66
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr "Thiếu thư mục kho %spartial."
+msgstr "Thiếu thư mục kho « %spartial »."
#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Đang tải về tập tin %li trên %li (%s còn lại)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
-msgstr "Không tìm thấy trình hỗ trợ phương pháp %s."
+msgstr "Không tìm thấy trình điều khiển phương pháp %s."
#: apt-pkg/acquire-worker.cc:162
#, c-format
@@ -2515,147 +2465,149 @@ msgid "Method %s did not start correctly"
msgstr "Phương pháp %s đã không bắt đầu cho đúng."
#: 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 ""
-"Chuyển đổi phương tiện: hãy nạp đĩa có nhãn\n"
-" '%s'\n"
-"vào ổ '%s' và bấm nút Enter\n"
+msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "Không hỗ trợ hệ thống đóng gói '%s'."
+msgstr "Không hỗ trợ hệ thống đóng gói « %s »"
#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
-msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp."
+msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp"
#: apt-pkg/clean.cc:61
#, c-format
msgid "Unable to stat %s."
-msgstr "Không thể gọi các thông tin cho %s."
+msgstr "Không thể lấy các thông tin về %s."
#: apt-pkg/srcrecords.cc:48
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Bạn phải để một số địa chỉ Mạng «nguồn» vào danh sách nguồn."
+msgstr ""
+"Bạn phải để một số địa chỉ Mạng « nguồn » vào « sources.list » (danh sách "
+"nguồn)"
#: apt-pkg/cachefile.cc:73
msgid "The package lists or status file could not be parsed or opened."
-msgstr "Không thể phân tách hay mở danh sách hay tâp tin trạng thái."
+msgstr "Không thể phân tách hay mở danh sách gói hay tâp tin trạng thái."
#: apt-pkg/cachefile.cc:77
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-"Có lẽ bạn muốn chạy apt-get update (gọi cập nhật) để sửa các vấn đề này."
+"Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này"
#: apt-pkg/policy.cc:269
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-"Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Gói "
-"(Package)."
+"Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package "
+"(Gói)."
#: apt-pkg/policy.cc:291
#, c-format
msgid "Did not understand pin type %s"
-msgstr "Chưa hiểu kiểu ghim %s."
+msgstr "Không hiểu kiểu ghim %s"
#: apt-pkg/policy.cc:299
msgid "No priority (or zero) specified for pin"
-msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim."
+msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
#: apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
-msgstr "Bộ nhớ tạn có hệ thống điêu khiển phiên bản không tương thích."
+msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích"
#: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Gặp lỗi khi xử lý %s (NewPackage - Gói mới)."
+msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)"
#: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - Dùng gói 1)."
+msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)"
#: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - Dùng gói 2)."
+msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)"
#: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)."
+msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)"
#: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Gặp lỗi khi xử lý %s (NewVersion1 - Phiên bản mới 1)."
+msgstr "Gặp lỗi khi xử lý %s (NewVersion1 - phiên bản mới 1)"
#: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Gặp lỗi khi xử lý %s (UsePackage3 - Dùng gói 3)."
+msgstr "Gặp lỗi khi xử lý %s (UsePackage3 - dùng gói 3)"
#: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - Phiên ban mới 2)."
+msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)"
#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Hay quá, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
+msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý."
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Hay quá, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
+msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Hay quá, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
+msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
#: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Gặp lỗi khi xử lý %s (FindPkg - Tìm gói)."
+msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
#: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-"Gặp lỗi khi xử lý %s (CollectFileProvides - Tập hợp các trường hợp gói phụ "
-"thuộc vào một tập tin)"
+"Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn là "
+"một tập tin)"
#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin."
+msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin"
#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr "Không thể gọi các thông tin cho danh sách gói nguồn %s."
+msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s"
#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
-msgstr "Đang tập hợp các trường hợp gói phụ thuộc vào một tập tin."
+msgstr "Đang tập hợp các trường hợp « tập tin miễn là »"
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
-msgstr "Lỗi gõ/xuất khi lưu bộ nhớ tạm nguồn."
+msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr "không đổi tên được, %s (%s -> %s)."
+msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
-msgstr "Không khớp MD5Sum (tổng kiểm)."
+msgstr "MD5Sum (tổng kiểm) không khớp được"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2664,7 +2616,7 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2673,22 +2625,22 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này."
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-"Các tập tin mục lục của gói ấy bị hỏng. Không có trường Filename: (Tên tập "
+"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
"tin:) cho gói %s."
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
-msgstr "Không khớp cỡ."
+msgstr "Kích cỡ không khớp được"
#: apt-pkg/vendorlist.cc:66
-#, fuzzy, c-format
+#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr "Khối nhà bán %s không hợp lệ."
+msgstr "Khối nhà bán %s không chứa vân tay"
#: apt-pkg/cdrom.cc:507
#, c-format
@@ -2696,47 +2648,48 @@ msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
+"Đang dùng điểm lắp đĩa CD-ROM %s\n"
+"Đang lắp đĩa CD-ROM...\n"
#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
-msgstr ""
+msgstr "Đang nhận diện... "
#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
-msgstr ""
+msgstr "Nhãn đã lưu : %s\n"
#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr ""
+msgstr "Đang dùng điểm lắp đĩa CD-ROM %s\n"
#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
-msgstr ""
+msgstr "Đang tháo lắp đĩa CD-ROM...\n"
#: apt-pkg/cdrom.cc:583
-#, fuzzy
msgid "Waiting for disc...\n"
-msgstr "Đang đợi những phần đầu."
+msgstr "Đang đợi đĩa...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
-msgstr ""
+msgstr "Đang lắp đĩa CD-ROM...\n"
#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
-msgstr ""
+msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n"
#: apt-pkg/cdrom.cc:647
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
-msgstr ""
+msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n"
#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
-msgstr ""
+msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n"
#: apt-pkg/cdrom.cc:726
#, c-format
@@ -2744,106 +2697,97 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
+"Tên đĩa này:\n"
+"%s\n"
#: apt-pkg/cdrom.cc:730
-#, fuzzy
msgid "Copying package lists..."
-msgstr "Đang đọc các danh sách gói."
+msgstr "Đang sao chép các danh sách gói..."
#: apt-pkg/cdrom.cc:754
-#, fuzzy
msgid "Writing new source list\n"
-msgstr "Dòng %u quá dài trong danh sách nguồn %s."
+msgstr "Đang ghi danh sách nguồn mới...\n"
#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
-msgstr ""
+msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
-msgstr ""
+msgstr "Đang tháo lắp đĩa CD-ROM..."
#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
-msgstr ""
+msgstr "Mới ghi %i mục ghi.\n"
#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n"
#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n"
#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+"Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
+"nhau\n"
#: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
msgid "Preparing %s"
-msgstr "Đang mở %s..."
+msgstr "Đang chuẩn bị %s..."
#: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
msgid "Unpacking %s"
-msgstr "Đang mở %s..."
+msgstr "Đang mở gói %s..."
#: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Đang mở tập tin cấu hình %s."
+msgstr "Đang chuẩn bị cấu hình %s..."
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Đang kết nối đến %s."
+msgstr "Đang cấu hình %s..."
#: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
msgid "Installed %s"
-msgstr " Đã cài đặt: "
+msgstr "Đã cài đặt %s"
#: apt-pkg/deb/dpkgpm.cc:371
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Đang chuẩn bị gỡ bỏ %s..."
#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
msgid "Removing %s"
-msgstr "Đang mở %s..."
+msgstr "Đang gỡ bỏ %s..."
#: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
msgid "Removed %s"
-msgstr "Khuyến khích"
+msgstr "Đã gỡ bỏ %s"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "Đang chuẩn bị gỡ bỏ với cấu hình %s..."
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Mới gỡ bỏ với cấu hình %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Kết nối bị đóng quá sớm."
-
-#~ msgid "Write Error"
-#~ msgstr "Lỗi ghi"
-
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr ""
-#~ "Không biết mã nhận biết nhà bán '%s' trên dòng %u trong danh sách nguồn %"
-#~ "s."
-
-#~ msgid "File Not Found"
-#~ msgstr "Không tìm thấy tập tin."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3d4d988ec..306825b45 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,15 +1,15 @@
# Chinese/Simplified translation of apt.
# This file is put in the public domain.
# Tchaikov <tchaikov@sjtu.edu.cn>, 2005.
-# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2006
#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2005-11-15 00:05+0800\n"
-"Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
+"POT-Creation-Date: 2006-01-20 14:06+0100\n"
+"PO-Revision-Date: 2006-02-22 14:20+1300\n"
+"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -512,7 +512,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "无法读取 %s 的状态"
@@ -1074,9 +1074,9 @@ msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
#: cmdline/apt-get.cc:1959
-#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "忽略已下载过的文件“%s”\n"
#: cmdline/apt-get.cc:1983
#, c-format
@@ -1651,12 +1651,12 @@ msgstr "找不到光盘。"
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1783,7 +1783,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "把文件加入散列表时出错"
@@ -1913,76 +1913,76 @@ msgstr "无法为 %s 开启管道"
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "受到了一行报头条目,它的长度超过了 %u 个字符"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "错误的报头条目"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "该 http 服务器发送了一个无效的应答报头"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "该 http 服务器的 range 支持不正常"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "连接服务器超时"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "写文件时出错"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "写文件时出错"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "内部错误"
@@ -2522,11 +2522,15 @@ msgstr "无法写入来源缓存文件"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "以下 key ID 没有可用的公钥:\n"
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2535,7 +2539,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2543,13 +2547,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "大小不符"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 43be4c21b..9f38ab7fa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+0100\n"
"PO-Revision-Date: 2005-02-19 22:24+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -518,7 +518,7 @@ msgid " DeLink limit of %sB hit.\n"
msgstr " 達到了 DeLink 的上限 %sB。\n"
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
#, c-format
msgid "Failed to stat %s"
msgstr "無法取得 %s 的狀態"
@@ -1084,7 +1084,7 @@ msgstr "無法找到 %s 套件的源碼"
#: cmdline/apt-get.cc:1959
#, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
#: cmdline/apt-get.cc:1983
@@ -1663,12 +1663,12 @@ msgstr "找不到檔案"
msgid "File not found"
msgstr "找不到檔案"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "無法讀取資料"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "日期更新失敗"
@@ -1794,7 +1794,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法允許連線"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "問題雜湊表"
@@ -1926,76 +1926,76 @@ msgstr "無法開啟管線給 %s 使用"
msgid "Read error from %s process"
msgstr "從 %s 進程讀取錯誤"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "取得一個單行超過 %u 字元的標頭"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "壞的標頭"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "http 伺服器傳送一個無效的回覆標頭"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "http 伺服器有損毀的範圍支援"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select 失敗"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "寫入輸出檔時發生錯誤"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "從遠端主機讀取錯誤,關閉連線"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "從伺服器讀取發生錯誤"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "壞的標頭資料"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "內部錯誤"
@@ -2533,31 +2533,35 @@ msgstr "無法寫入來源暫存檔。"
msgid "rename failed, %s (%s -> %s)."
msgstr "檔名因『%s』更換失敗 (%s → %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼不符合。"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
msgid "Size mismatch"
msgstr "檔案大小不符合。"