summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/acquire-item.cc30
-rw-r--r--apt-pkg/cdrom.cc4
-rw-r--r--apt-pkg/deb/debrecords.cc28
-rw-r--r--apt-pkg/deb/debrecords.h1
-rw-r--r--apt-pkg/pkgrecords.h1
-rw-r--r--buildlib/archtable4
-rw-r--r--buildlib/sizetable1
-rw-r--r--buildlib/systemtable11
-rw-r--r--configure.in9
-rw-r--r--debian/changelog45
-rw-r--r--po/ChangeLog23
-rw-r--r--po/apt-all.pot392
-rw-r--r--po/bg.po96
-rw-r--r--po/bs.po98
-rw-r--r--po/ca.po96
-rw-r--r--po/cs.po96
-rw-r--r--po/cy.po98
-rw-r--r--po/da.po50
-rw-r--r--po/de.po96
-rw-r--r--po/el.po96
-rw-r--r--po/en_GB.po96
-rw-r--r--po/es.po96
-rw-r--r--po/eu.po102
-rw-r--r--po/fi.po96
-rw-r--r--po/fr.po184
-rw-r--r--po/gl.po50
-rw-r--r--po/he.po95
-rw-r--r--po/hu.po96
-rw-r--r--po/it.po96
-rw-r--r--po/ja.po96
-rw-r--r--po/ko.po96
-rw-r--r--po/nb.po96
-rw-r--r--po/nl.po96
-rw-r--r--po/nn.po96
-rw-r--r--po/pl.po96
-rw-r--r--po/pt.po103
-rw-r--r--po/pt_BR.po96
-rw-r--r--po/ro.po96
-rw-r--r--po/ru.po175
-rw-r--r--po/sk.po96
-rw-r--r--po/sl.po96
-rw-r--r--po/sv.po96
-rw-r--r--po/tl.po50
-rw-r--r--po/vi.po103
-rw-r--r--po/zh_CN.po66
-rw-r--r--po/zh_TW.po96
46 files changed, 2069 insertions, 1766 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 3fd2304d2..3d05e62ae 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -13,9 +13,6 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/acquire-item.h"
-#endif
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/sourcelist.h>
@@ -78,7 +75,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
Dequeue();
return;
}
-
+
Status = StatError;
Dequeue();
}
@@ -270,13 +267,17 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
}
}
- // we have something, queue the next diff
- if(found)
+ // no information how to get the patches, bail out
+ if(!found)
+ {
+ if(Debug)
+ std::clog << "Can't find a patch in the index file" << std::endl;
+ // Failed will queue a big package file
+ Failed("", NULL);
+ }
+ else
{
// queue the diffs
- int last_space = Description.rfind(" ");
- if(last_space != string::npos)
- Description.erase(last_space, Description.size()-last_space);
new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
ExpectedMD5, available_patches);
Complete = false;
@@ -286,11 +287,6 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
}
}
- // Nothing found, report and return false
- // Failing here is ok, if we return false later, the full
- // IndexFile is queued
- if(Debug)
- std::clog << "Can't find a patch in the index file" << std::endl;
return false;
}
@@ -357,7 +353,7 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
- Description = URIDesc;
+ Desc.Description = URIDesc;
Desc.Owner = this;
Desc.ShortDesc = ShortDesc;
@@ -466,7 +462,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff()
// queue the right diff
Desc.URI = string(RealURI) + ".diff/" + available_patches[0].file + ".gz";
- Desc.Description = Description + " " + available_patches[0].file + string(".pdiff");
+ Desc.Description = available_patches[0].file + string(".pdiff");
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(RealURI + ".diff/" + available_patches[0].file);
@@ -855,7 +851,7 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
if(Status == StatTransientNetworkError)
{
Item::Failed(Message,Cnf);
- // move the sigfile back on network failures (and re-authenticated?)
+ // move the sigfile back on transient network failures
if(FileExists(DestFile))
Rename(DestFile,Final);
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index aefe9c9e9..e61344eee 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -707,7 +707,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
if(log) {
msg.str("");
- ioprintf(msg, "Found label '%s'\n", Name.c_str());
+ ioprintf(msg, _("Found label '%s'\n"), Name.c_str());
log->Update(msg.str());
}
Database.Set("CD::" + ID + "::Label",Name);
@@ -833,7 +833,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
// Unmount and finish
if (_config->FindB("APT::CDROM::NoMount",false) == false) {
- log->Update(_("Unmounting CD-ROM..."), STEP_LAST);
+ log->Update(_("Unmounting CD-ROM...\n"), STEP_LAST);
UnmountCdrom(CDROM);
}
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 5eb2d67bb..2aa47e343 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -111,18 +111,44 @@ string debRecordParser::LongDesc()
return orig;
}
/*}}}*/
+
+static const char *SourceVerSeparators = " ()";
+
// RecordParser::SourcePkg - Return the source package name if any /*{{{*/
// ---------------------------------------------------------------------
/* */
string debRecordParser::SourcePkg()
{
string Res = Section.FindS("Source");
- string::size_type Pos = Res.find(' ');
+ string::size_type Pos = Res.find_first_of(SourceVerSeparators);
if (Pos == string::npos)
return Res;
return string(Res,0,Pos);
}
/*}}}*/
+// RecordParser::SourceVer - Return the source version number if present /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string debRecordParser::SourceVer()
+{
+ string Pkg = Section.FindS("Source");
+ string::size_type Pos = Pkg.find_first_of(SourceVerSeparators);
+ if (Pos == string::npos)
+ return "";
+
+ string::size_type VerStart = Pkg.find_first_not_of(SourceVerSeparators, Pos);
+ if(VerStart == string::npos)
+ return "";
+
+ string::size_type VerEnd = Pkg.find_first_of(SourceVerSeparators, VerStart);
+ if(VerEnd == string::npos)
+ // Corresponds to the case of, e.g., "foo (1.2" without a closing
+ // paren. Be liberal and guess what it means.
+ return string(Pkg, VerStart);
+ else
+ return string(Pkg, VerStart, VerEnd - VerStart);
+}
+ /*}}}*/
// RecordParser::GetRec - Return the whole record /*{{{*/
// ---------------------------------------------------------------------
/* */
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index fdf8d762b..df21931a8 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -36,6 +36,7 @@ class debRecordParser : public pkgRecords::Parser
virtual string MD5Hash();
virtual string SHA1Hash();
virtual string SourcePkg();
+ virtual string SourceVer();
// These are some general stats about the package
virtual string Maintainer();
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 21aa66322..ea1a23fc4 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -57,6 +57,7 @@ class pkgRecords::Parser
virtual string MD5Hash() {return string();};
virtual string SHA1Hash() {return string();};
virtual string SourcePkg() {return string();};
+ virtual string SourceVer() {return string();};
// These are some general stats about the package
virtual string Maintainer() {return string();};
diff --git a/buildlib/archtable b/buildlib/archtable
index 197529202..eacc9889f 100644
--- a/buildlib/archtable
+++ b/buildlib/archtable
@@ -22,8 +22,12 @@ mips mips
sheb sheb
shel sh
sh sh
+sh3 sh3
+sh4 sh4
+m32r m32r
hppa.* hppa
ia64 ia64
s390 s390
s390x s390x
x86_64 amd64
+# lipa has gnulp-linux-i.86 (see dpkg archtable and ostable)
diff --git a/buildlib/sizetable b/buildlib/sizetable
index 8b18528cf..b5782360c 100644
--- a/buildlib/sizetable
+++ b/buildlib/sizetable
@@ -21,3 +21,4 @@ m68k big 1 4 2 4
powerpc big 1 4 2 4
mips big 1 4 2 4
hppa big 1 4 2 4
+m32r big 1 4 2 4 \ No newline at end of file
diff --git a/buildlib/systemtable b/buildlib/systemtable
new file mode 100644
index 000000000..64c176b50
--- /dev/null
+++ b/buildlib/systemtable
@@ -0,0 +1,11 @@
+# This file contains a table of known canonical system strings, with
+# things to map them to. `configure' will take the output of the
+# autoconf cannon macros and look in here. It will check for
+# the full canonical system name (required for e.g. lpia) and if that
+# fails it will configure.in will fallback to just checking for the CPU
+# in buildlib/archtable
+
+# The left side is a regex for awk against the canonical system name
+
+# config.guess reports lpia as i386-unknown-linux-gnulp
+i.86-.*-linux-gnulp lpia
diff --git a/configure.in b/configure.in
index 9fa113938..34d4dcc78 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.7.0")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.2")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
@@ -78,10 +78,15 @@ AC_SUBST(BDBLIB)
dnl Converts the ARCH to be something singular for this general CPU family
dnl This is often the dpkg architecture string.
+dnl First check against the full canonical canoncial-system-type in $target
+dnl and if that fails, just look for the cpu
AC_MSG_CHECKING(system architecture)
-archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
+archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`"
if test "x$archset" = "x"; then
+ archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
+ if test "x$archset" = "x"; then
AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
+ fi
fi
AC_MSG_RESULT($archset)
AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
diff --git a/debian/changelog b/debian/changelog
index bbe4c0256..a57cf4577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,35 @@
+apt (0.7.2) unstable; urgency=low
+
+ * merged the debian/experimental changes back
+ into the debian/sid branch
+ * merged from Christian Perrier:
+ * mr.po: New Marathi translation Closes: #416806
+ * zh_CN.po: Updated by Eric Pareja Closes: #416822
+ * tl.po: Updated by Eric Pareja Closes: #416638
+ * gl.po: Updated by Jacobo Tarrio
+ Closes: #412828
+ * da.po: Updated by Claus Hindsgaul
+ Closes: #409483
+ * fr.po: Remove a non-breakable space for usability
+ issues. Closes: #408877
+ * ru.po: Updated Russian translation. Closes: #405476
+ * *.po: Unfuzzy after upstream typo corrections
+ * buildlib/archtable:
+ - added support for sh3/sh4 (closes: #424870)
+ - added support for m32r (closes: #394096)
+ * buildlib/systemtable:
+ - added support for lpia
+ * configure.in:
+ - check systemtable for architecture mapping too
+
+ -- Michael Vogt <mvo@debian.org> Wed, 06 Jun 2007 23:19:50 +0200
+
apt (0.7.1) experimental; urgency=low
+ * ABI library name change because its build against
+ new glibc
+ * implement SourceVer() in pkgRecords
+ (thanks to Daniel Burrows for the patch!)
* apt-pkg/algorithm.cc:
- use clog for all debugging
- only increase the score of installed applications if they
@@ -33,6 +63,12 @@ apt (0.7.1) experimental; urgency=low
issues. Closes: #408877
* ru.po: Updated Russian translation. Closes: #405476
* *.po: Unfuzzy after upstream typo corrections
+ * vi.po: Updated to 515t. Closes: #426976
+ * eu.po: Updated to 515t. Closes: #423766
+ * pt.po: 515t. Closes: #423111
+ * fr.po: Updated by Christian Perrier
+ * Update all PO and the POT. Gives 513t2f for formerly
+ complete translations
* apt-pkg/policy.cc:
- allow multiple packages (thanks to David Foerster)
@@ -154,9 +190,11 @@ apt (0.6.46.1) unstable; urgency=low
* merged "install-task" branch (use with "apt-get install taskname^")
* methods/gzip.cc:
- deal with empty files
- * Applied patch from Daniel Schepler to make apt bin-NMU able.
+ * Applied patch from Daniel Schepler to make apt bin-NMU able.
+ (closes: bug#359634)
* rebuild against current g++ because of:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289
+ (closes: #390189)
* fix broken i18n in the dpkg progress reporting, thanks to
Frans Pop and Steinar Gunderson. (closes: #389261)
* Merged from Christian Perrier bzr branch:
@@ -209,7 +247,7 @@ apt (0.6.45) unstable; urgency=low
* apt-pkg/contrib/sha256.cc:
- fixed the sha256 generation (closes: #378183)
* ftparchive/cachedb.cc:
- - applied patch from ajt to fix Clean() function
+ - applied patch from Anthony Towns to fix Clean() function
(closes: #379576)
* doc/apt-get.8.xml:
- fix path to the apt user build (Closes: #375640)
@@ -227,6 +265,9 @@ apt (0.6.45) unstable; urgency=low
- fix for string mangling, closes: #373864
* apt-pkg/acquire-item.cc:
- check for bzip2 in /bin (closes: #377391)
+ * apt-pkg/tagfile.cc:
+ - make it work on non-mapable files again, thanks
+ to James Troup for confirming the fix (closes: #376777)
* Merged from Christian Perrier bzr branch:
* ko.po: Updated to 512t. Closes: #378901
* hu.po: Updated to 512t. Closes: #376330
diff --git a/po/ChangeLog b/po/ChangeLog
index 0d2ad6e3f..930feedc0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,24 @@
+2007-06-01 Clytie Siddall <clytie@riverland.net.au>
+
+ * vi.po: Updated to 515t. Closes: #426976
+
+2007-05-13 Piarres Beobide <pi@beobide.net>
+
+ * eu.po: Updated to 515t. Closes: #423766
+
+2007-05-10 Miguel Figueiredo <elmig@debianpt.org>
+
+ * pt.po: 515t. Closes: #423111
+
+2007-05-08 Christian Perrier <bubulle@debian.org>
+
+ * fr.po: Updated by Christian Perrier
+
+2007-05-08 Christian Perrier <bubulle@debian.org>
+
+ * Update all PO and the POT. Gives 513t2f for formerly
+ complete translations
+
2007-04-01 priti Patil <prithisd@gmail.com>
* mr.po: New Marathi translation
@@ -5,7 +26,7 @@
2007-03-31 Kov Chai <tchaikov@sjtu.org>
- * zh_CN.po: Updated by Eric Pareja
+ * zh_CN.po: Updated by Kov Chai
Closes: #416822
2007-03-29 eric pareja <xenos@upm.edu.ph>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index bd066ab06..749d47844 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: 2006-08-15 15:55+0200\n"
+"POT-Creation-Date: 2007-06-06 23:30+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,153 +15,153 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:143
#, 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:1413 cmdline/apt-cache.cc:1564
+#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
+#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
+#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
#, c-format
msgid "Unable to locate package %s"
msgstr ""
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:247
msgid "Total package names : "
msgstr ""
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:287
msgid " Normal packages: "
msgstr ""
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:288
msgid " Pure virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:289
msgid " Single virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:290
msgid " Mixed virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:291
msgid " Missing: "
msgstr ""
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:293
msgid "Total distinct versions: "
msgstr ""
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:295
msgid "Total Distinct Descriptions: "
msgstr ""
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:297
msgid "Total dependencies: "
msgstr ""
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:300
msgid "Total ver/file relations: "
msgstr ""
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:302
msgid "Total Desc/File relations: "
msgstr ""
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:304
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:316
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:330
msgid "Total dependency version space: "
msgstr ""
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:335
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:343
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:1287
+#: cmdline/apt-cache.cc:1293
msgid "You must give exactly one pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1447
msgid "No packages found"
msgstr ""
-#: cmdline/apt-cache.cc:1518
+#: cmdline/apt-cache.cc:1524
msgid "Package files:"
msgstr ""
-#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-#: cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1532
#, c-format
msgid "%4i %s\n"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1538
+#: cmdline/apt-cache.cc:1544
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591
+#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
msgid "(not found)"
msgstr ""
#. Installed version
-#: cmdline/apt-cache.cc:1571
+#: cmdline/apt-cache.cc:1577
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
msgid "(none)"
msgstr ""
#. Candidate Version
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1584
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1594
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1603
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1612
+#: cmdline/apt-cache.cc:1618
#, c-format
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1708 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2564 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1715
+#: cmdline/apt-cache.cc:1721
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -251,8 +251,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:817
-#: apt-pkg/pkgcachegen.cc:819
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -555,7 +554,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -714,11 +713,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
@@ -747,7 +746,7 @@ msgstr ""
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -781,7 +780,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1382 cmdline/apt-get.cc:2107
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -790,7 +789,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218
msgid "Download complete and in download only mode"
msgstr ""
@@ -890,55 +889,75 @@ msgstr ""
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1415
+#: cmdline/apt-get.cc:1433
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1440
+#: cmdline/apt-get.cc:1465
+msgid ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1467
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""
+
+#: cmdline/apt-get.cc:1472
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1443 cmdline/apt-get.cc:1642
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1736
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1447
+#: cmdline/apt-get.cc:1479
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1466
+#: cmdline/apt-get.cc:1498
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
+#: cmdline/apt-get.cc:1543
+#, c-format
+msgid "Couldn't find task %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1665
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1695
+#, c-format
+msgid "%s set to manual installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1708
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1617
+#: cmdline/apt-get.cc:1711
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1629
+#: cmdline/apt-get.cc:1723
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"
@@ -946,159 +965,159 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1637
+#: cmdline/apt-get.cc:1731
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:1645
+#: cmdline/apt-get.cc:1739
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1676
+#: cmdline/apt-get.cc:1770
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1765
+#: cmdline/apt-get.cc:1859
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1766
+#: cmdline/apt-get.cc:1860
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1786
+#: cmdline/apt-get.cc:1888
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1794
+#: cmdline/apt-get.cc:1896
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
+#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:2071
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2145
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2067
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2072
+#: cmdline/apt-get.cc:2174
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2075
+#: cmdline/apt-get.cc:2177
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2081
+#: cmdline/apt-get.cc:2183
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2112
+#: cmdline/apt-get.cc:2214
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2140
+#: cmdline/apt-get.cc:2242
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2152
+#: cmdline/apt-get.cc:2254
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2153
+#: cmdline/apt-get.cc:2255
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2170
+#: cmdline/apt-get.cc:2272
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2189
+#: cmdline/apt-get.cc:2291
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2205
+#: cmdline/apt-get.cc:2307
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2335
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2253
+#: cmdline/apt-get.cc:2355
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2305
+#: cmdline/apt-get.cc:2407
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2459
#, 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:2392
+#: cmdline/apt-get.cc:2494
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2519
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2431
+#: cmdline/apt-get.cc:2533
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2537
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2569
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2610
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1383,9 +1402,7 @@ 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:750
-#: apt-pkg/pkgcachegen.cc:819 apt-pkg/pkgcachegen.cc:824
-#: apt-pkg/pkgcachegen.cc:947 apt-pkg/pkgcachegen.cc:752
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752
#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
#: apt-pkg/pkgcachegen.cc:949
msgid "Reading package lists"
@@ -1502,28 +1519,26 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr ""
-#: methods/cdrom.cc:164 methods/cdrom.cc:166
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-#: methods/cdrom.cc:169 methods/cdrom.cc:171
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr ""
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
-#: methods/cdrom.cc:179
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr ""
-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
-#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
-#: methods/gzip.cc:141 methods/gzip.cc:150
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
-#: methods/rred.cc:240 methods/gzip.cc:147
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+#: methods/rred.cc:240
msgid "Failed to set modification time"
msgstr ""
@@ -1649,8 +1664,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
-#: methods/http.cc:958
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1771,87 +1785,86 @@ msgid ""
"available:\n"
msgstr ""
-#: methods/gzip.cc:57 methods/gzip.cc:64
+#: methods/gzip.cc:64
#, c-format
msgid "Couldn't open pipe for %s"
msgstr ""
-#: methods/gzip.cc:102 methods/gzip.cc:109
+#: methods/gzip.cc:109
#, c-format
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:375 methods/http.cc:376
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:521 methods/http.cc:522
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:529 methods/http.cc:530
+#: methods/http.cc:530
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:548 methods/http.cc:555 methods/http.cc:549
-#: methods/http.cc:556
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:584 methods/http.cc:585
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:599 methods/http.cc:600
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:601 methods/http.cc:602
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:625 methods/http.cc:626
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:772 methods/http.cc:773
+#: methods/http.cc:773
msgid "Select failed"
msgstr ""
-#: methods/http.cc:777 methods/http.cc:778
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:800 methods/http.cc:801
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:831 methods/http.cc:832
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:859 methods/http.cc:860
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:873 methods/http.cc:874
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:875 methods/http.cc:876
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1106 methods/http.cc:1107
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1123 methods/http.cc:1124
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1214 methods/http.cc:1215
+#: methods/http.cc:1215
msgid "Internal error"
msgstr ""
@@ -1924,12 +1937,12 @@ msgstr ""
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr ""
-#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr ""
@@ -2061,109 +2074,111 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:132
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:138
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:143
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:148
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:153
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:224
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:224
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:224
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:225
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:225
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:225
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:226
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:226
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:237
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:237
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:237
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:238
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:238
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
-#: apt-pkg/depcache.cc:127
+#: apt-pkg/depcache.cc:98 apt-pkg/depcache.cc:127
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99
+#: apt-pkg/depcache.cc:99
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128
+#: apt-pkg/depcache.cc:128
msgid "Dependency generation"
msgstr ""
-#: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196
+#: apt-pkg/depcache.cc:196
#, c-format
msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202
+#: apt-pkg/depcache.cc:202
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr ""
-#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106
+#: apt-pkg/tagfile.cc:106
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
-#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193
+#: apt-pkg/tagfile.cc:193
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
@@ -2218,7 +2233,7 @@ msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:402 apt-pkg/packagemanager.cc:403
+#: apt-pkg/packagemanager.cc:403
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2231,19 +2246,19 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:245 apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:248
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1075 apt-pkg/algorithms.cc:1104
+#: apt-pkg/algorithms.cc:1104
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1077 apt-pkg/algorithms.cc:1106
+#: apt-pkg/algorithms.cc:1106
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2259,12 +2274,12 @@ msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823 apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825 apt-pkg/acquire.cc:832
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
@@ -2279,7 +2294,7 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:377 apt-pkg/acquire-worker.cc:384
+#: apt-pkg/acquire-worker.cc:384
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2310,16 +2325,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:269 apt-pkg/policy.cc:270
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:291 apt-pkg/policy.cc:292
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:299 apt-pkg/policy.cc:300
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -2403,56 +2418,54 @@ msgstr ""
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:681 apt-pkg/pkgcachegen.cc:682
+#: apt-pkg/pkgcachegen.cc:682
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:765 apt-pkg/pkgcachegen.cc:767
+#: apt-pkg/pkgcachegen.cc:767
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:892 apt-pkg/pkgcachegen.cc:899
#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:130
+#: apt-pkg/acquire-item.cc:127
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:408 apt-pkg/acquire-item.cc:658
-#: apt-pkg/acquire-item.cc:1402 apt-pkg/acquire-item.cc:409
-#: apt-pkg/acquire-item.cc:666 apt-pkg/acquire-item.cc:1416
+#: apt-pkg/acquire-item.cc:405 apt-pkg/acquire-item.cc:662
+#: apt-pkg/acquire-item.cc:1412
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1097
-msgid "There are no public key available for the following key IDs:\n"
+#: apt-pkg/acquire-item.cc:1107
+msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1210 apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1220
#, 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:1269 apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1279
#, 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:1305 apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1315
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1392 apt-pkg/acquire-item.cc:1406
+#: apt-pkg/acquire-item.cc:1402
msgid "Size mismatch"
msgstr ""
@@ -2506,31 +2519,36 @@ msgid ""
"signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:737 apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:710
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:753 apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:757 apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:759
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:783 apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:792 apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:832 apt-pkg/cdrom.cc:836
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:836
+msgid "Unmounting CD-ROM...\n"
msgstr ""
#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
@@ -2610,11 +2628,3 @@ msgstr ""
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
-
-#: apt-pkg/acquire-item.cc:1097 apt-pkg/acquire-item.cc:1111
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:226
-msgid "Breaks"
-msgstr ""
diff --git a/po/bg.po b/po/bg.po
index a37ed355d..0738441b9 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-12 20:14+0300\n"
"Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -1681,16 +1681,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Грешен CD-ROM"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Неуспех при демонтирането на CD-ROM в %s, може все още да се използва."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Дискът не е намерен."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Файлът не е намерен"
@@ -1829,7 +1829,7 @@ msgstr "Времето за установяване на връзка с гне
msgid "Unable to accept connection"
msgstr "Невъзможно е да се приеме свързването"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблем при хеширане на файла"
@@ -1968,76 +1968,76 @@ msgstr "Неуспех при отварянето на програмен ка
msgid "Read error from %s process"
msgstr "Грешка при четене от процес %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Чакане на заглавни части"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен е един ред на заглавна част с над %u символа"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Невалиден ред на заглавна част"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Неизвестен формат на дата"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Неуспех на избора"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Допустимото време за свързване изтече"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Грешка при записа на изходен файл"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Грешка при записа на файл"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Грешка при записа на файла"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Грешка при четене от сървъра"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Невалидни данни на заглавната част"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Неуспех при свързването"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Вътрешна грешка"
@@ -2112,12 +2112,12 @@ msgstr "Синтактична грешка %s:%u: Неподдържана ди
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Грешка!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Готово"
@@ -2422,7 +2422,7 @@ msgstr ""
"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
"него."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2430,7 +2430,7 @@ msgstr ""
"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
"причинено от задържани пакети."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Неуспех при коригирането на проблемите, имате задържани счупени пакети."
@@ -2447,12 +2447,12 @@ msgstr "Директорията за архиви %spartial липсва."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Изтегляне на файл %li от %li (остават %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Изтегляне на файл %li от %li"
@@ -2501,16 +2501,16 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Невалиден запис във файла с настройки, няма заглавна част Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Неизвестен тип за отбиване %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Няма указан приоритет (или е нула) на отбиването"
@@ -2602,15 +2602,15 @@ msgstr "Входно/изходна грешка при запазването
msgid "rename failed, %s (%s -> %s)."
msgstr "преименуването се провали, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Несъответствие на контролна сума MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2619,7 +2619,7 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2628,14 +2628,14 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Несъответствие на размера"
@@ -2691,11 +2691,16 @@ msgstr ""
"Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i "
"подписа.\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Запазен етикет: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Това не е валидно име, опитайте отново.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2704,20 +2709,21 @@ msgstr ""
"Наименование на този диск: \n"
"„%s“\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Копиране на списъците с пакети..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Запазване на новия списък с източници\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Записите в списъка с източници за този диск са:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Демонтиране на CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/bs.po b/po/bs.po
index 8f6d0e69d..aaa8a5948 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: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\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"
@@ -1493,17 +1493,17 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Pogrešan CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "Datoteka nije pronađena"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Datoteka nije pronađena"
@@ -1639,7 +1639,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1771,76 +1771,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Čekam na zaglavlja"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr ""
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1913,12 +1913,12 @@ msgstr ""
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr ""
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr ""
@@ -2211,13 +2211,13 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2233,12 +2233,12 @@ msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Čitam spisak datoteke"
@@ -2284,16 +2284,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -2381,35 +2381,35 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, 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:812
+#: apt-pkg/acquire-item.cc:819
#, 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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr ""
@@ -2462,33 +2462,39 @@ msgstr ""
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
#, fuzzy
msgid "Copying package lists..."
msgstr "Čitam spiskove paketa"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr ""
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "Pogrešan CD"
#: apt-pkg/indexcopy.cc:261
#, c-format
diff --git a/po/ca.po b/po/ca.po
index 54b38bb78..ae0fc8d2d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\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"
@@ -1679,16 +1679,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD erroni"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
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
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "No s'ha trobat el disc"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fitxer no trobat"
@@ -1826,7 +1826,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1965,76 +1965,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:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "S'estan esperant les capçaleres"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, 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:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Línia de capçalera incorrecta"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
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:585
+#: methods/http.cc:586
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:600
+#: methods/http.cc:601
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:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Aquest servidor http té el suport d'abast trencat"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Error escrivint en el fitxer d'eixida"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Error llegint, el servidor remot ha tancat la connexió"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Error llegint des del servidor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Error intern"
@@ -2107,12 +2107,12 @@ msgstr "Error sintàctic %s:%u: Directriu no suportada '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Error sintàctic %s:%u: Text extra al final del fitxer"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Error!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Fet"
@@ -2409,7 +2409,7 @@ msgid ""
msgstr ""
"El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2417,7 +2417,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
"causat per paquets mantinguts."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No es poden corregir els problemes, teniu paquets mantinguts que estan "
@@ -2435,12 +2435,12 @@ msgstr "Falta el directori d'arxiu %spartial."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "S'està obtenint el fitxer %li de %li (falten %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "S'està obtenint el fitxer %li de %li"
@@ -2488,16 +2488,16 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Potser voldreu executar apt-get update per a corregir aquests problemes"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Registre no vàlid en el fitxer de preferències, paquet sense capçalera"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "No s'ha entès el pin de tipus %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "No hi ha prioritat especificada per al pin (o és zero)"
@@ -2589,15 +2589,15 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is 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:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2607,7 +2607,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2616,7 +2616,7 @@ 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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2624,7 +2624,7 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "La mida no concorda"
@@ -2678,11 +2678,16 @@ msgstr "S'està analitzant el disc per a fitxers d'índex...\n"
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:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
+
+#: apt-pkg/cdrom.cc:712
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:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2691,20 +2696,21 @@ msgstr ""
"El disc es diu:\n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "S'estan copiant les llistes de paquets..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "S'està escrivint una nova llista de fonts\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
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:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "S'esta desmuntant el CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/cs.po b/po/cs.po
index 8117a996b..41d41ce5b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-04 18:53+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -1654,16 +1654,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Chybné CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nemohu odpojit CD-ROM v %s - možná se stále používá."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk nebyl nalezen."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Soubor nebyl nalezen"
@@ -1800,7 +1800,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
@@ -1934,76 +1934,76 @@ msgstr "Nemohu otevřít rouru pro %s"
msgid "Read error from %s process"
msgstr "Chyba čtení z procesu %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Čekám na hlavičky"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, 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:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnou hlavičku odpovědi"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnou hlavičku Content-Length"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnou hlavičku Content-Range"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -2077,12 +2077,12 @@ msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Chyba!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Hotovo"
@@ -2377,7 +2377,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2385,7 +2385,7 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
"podrženými balíky."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu."
@@ -2401,12 +2401,12 @@ msgstr "Archivní adresář %spartial chybí."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Stahuji soubor %li z %li (%s zbývá)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Stahuji soubor %li z %li"
@@ -2453,16 +2453,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nerozumím vypíchnutí typu %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
@@ -2552,15 +2552,15 @@ msgstr "Chyba IO při ukládání zdrojové cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2569,7 +2569,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2578,14 +2578,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:848
+#: apt-pkg/acquire-item.cc:855
#, 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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
@@ -2639,11 +2639,16 @@ msgstr "Hledám na disku indexové soubory...\n"
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:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Uložený název: %s \n"
+
+#: apt-pkg/cdrom.cc:712
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:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2652,20 +2657,21 @@ msgstr ""
"Tento disk se nazývá: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopíruji seznamy balíků..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Zapisuji nový seznam balíků\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Seznamy zdrojů na tomto disku jsou:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Odpojuji CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/cy.po b/po/cy.po
index a763e3f7a..a0db79e08 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -1729,18 +1729,18 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD Anghywir"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "Ffeil heb ei ganfod"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
@@ -1880,7 +1880,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -2013,82 +2013,82 @@ msgstr "Methwyd agor pibell ar gyfer %s"
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:585
+#: methods/http.cc:586
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:600
+#: methods/http.cc:601
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:602
+#: methods/http.cc:603
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:874
+#: methods/http.cc:875
#, fuzzy
msgid "Error reading from server. Remote end closed connection"
msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2163,12 +2163,12 @@ msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Gwall!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Wedi Gorffen"
@@ -2476,7 +2476,7 @@ msgstr ""
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2484,7 +2484,7 @@ msgstr ""
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
@@ -2501,12 +2501,12 @@ msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Yn Darllen Rhestr Ffeiliau"
@@ -2558,17 +2558,17 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
# FIXME: literal
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
# FIXME: tense
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Methwyd daeall y math pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
@@ -2658,16 +2658,16 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2676,7 +2676,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2685,14 +2685,14 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -2745,34 +2745,40 @@ msgstr ""
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
#, fuzzy
msgid "Copying package lists..."
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
#, fuzzy
msgid "Writing new source list\n"
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr ""
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"
#: apt-pkg/indexcopy.cc:261
#, c-format
diff --git a/po/da.po b/po/da.po
index 1e9ce375d..2fb60f6e8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-19 11:37+0100\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-02-03 15:50+0100\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
@@ -1669,16 +1669,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Forkert cd"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Kunne ikke afmontere cdrommen i %s, den er muligvis stadig i brug."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk blev ikke fundet."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fil blev ikke fundet"
@@ -2420,12 +2420,12 @@ msgstr "Arkivmappen %spartial mangler."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Henter fil %li ud af %li (%s tilbage)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Henter fil %li ud af %li"
@@ -2471,16 +2471,16 @@ msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller bnes."
msgid "You may want to run apt-get update to correct these problems"
msgstr "Du kan muligvis rette problemet ved at kre 'apt-get update'"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Kunne ikke forst pin-type %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
@@ -2570,16 +2570,16 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
msgid "rename failed, %s (%s -> %s)."
msgstr "omdbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is 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:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2588,7 +2588,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2597,13 +2597,13 @@ 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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Strrelsen stemmer ikke"
@@ -2657,11 +2657,16 @@ msgstr "Skanner disken for indeksfiler..\n"
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:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Gemt mrkat: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikke et gyldigt navn, prv igen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2670,20 +2675,21 @@ msgstr ""
"Denne disk hedder: \n"
" %s \n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopierer pakkelisterne..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Skriver ny kildeliste\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Denne disk har flgende kildeliste-indgange:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Afmonterer cdrom..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/de.po b/po/de.po
index e07e5f6da..b5fdcb3e8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-24 11:45+0200\n"
"Last-Translator: Michael Piefel <piefel@debian.org>\n"
"Language-Team: <de@li.org>\n"
@@ -1695,18 +1695,18 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Falsche CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Kann Einbindung von CD-ROM in %s nicht lösen, möglicherweise wird sie noch "
"verwendet."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk nicht gefunden."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Datei nicht gefunden"
@@ -1845,7 +1845,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
msgid "Unable to accept connection"
msgstr "Kann Verbindung nicht annehmen"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
@@ -1984,78 +1984,78 @@ msgstr "Konnte keine Pipe für %s öffnen"
msgid "Read error from %s process"
msgstr "Lesefehler von Prozess %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Warte auf Kopfzeilen (header)"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Schlechte Kopfzeile"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Der http-Server sandte eine ungültige „Content-Length“-Kopfzeile"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Der http-Server sandte eine ungültige „Content-Range“-Kopfzeile"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft."
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben einer Ausgabedatei"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:874
+#: methods/http.cc:875
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:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2129,12 +2129,12 @@ msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive „%s“"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Fehler!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Fertig"
@@ -2433,7 +2433,7 @@ msgstr ""
"Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür "
"finden."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2441,7 +2441,7 @@ msgstr ""
"Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies "
"könnte durch gehaltene Pakete hervorgerufen worden sein."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete."
@@ -2457,12 +2457,12 @@ msgstr "Archivverzeichnis %spartial fehlt."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Hole Datei %li von %li (noch %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Hole Datei %li von %li"
@@ -2514,16 +2514,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Probieren Sie „apt-get update“, um diese Probleme zu korrigieren."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ungültiger Eintrag in Einstellungs-Datei, kein „Package“-Header"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Konnte Stecknadeltyp („pin type“) %s nicht verstehen"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Keine Priorität (oder Null) für Pin angegeben"
@@ -2617,16 +2617,16 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches"
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2635,7 +2635,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2644,14 +2644,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:848
+#: apt-pkg/acquire-item.cc:855
#, 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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
@@ -2705,11 +2705,16 @@ msgstr "Suche auf CD nach Index-Dateien...\n"
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:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Gespeicherte Kennzeichnung: %s \n"
+
+#: apt-pkg/cdrom.cc:712
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:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2718,20 +2723,21 @@ msgstr ""
"Diese CD heißt: \n"
"„%s“\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopiere Paketlisten..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Schreibe neue Quellliste\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Quelllisteneinträge für diese CD sind:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Hänge CD-ROM aus..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/el.po b/po/el.po
index fd9fe1eb2..61cb583c6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el_new\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\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"
@@ -1696,16 +1696,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Λάθος CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μπορεί να είναι σε χρήση."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Ο δίσκος δεν βρέθηκε."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Το αρχείο Δε Βρέθηκε"
@@ -1842,7 +1842,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
@@ -1977,77 +1977,77 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το
msgid "Read error from %s process"
msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Αναμονή επικεφαλίδων"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Ελαττωματική γραμμή επικεφαλίδας"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
@@ -2121,12 +2121,12 @@ msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμεν
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Σφάλμα!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Ολοκληρώθηκε"
@@ -2428,7 +2428,7 @@ msgstr ""
"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
"κάποιας κατάλληλης αρχείοθήκης."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2436,7 +2436,7 @@ msgstr ""
"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
"προκλήθηκε από κρατούμενα πακέτα."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
@@ -2452,12 +2452,12 @@ msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, fuzzy, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Ανάγνωση Λίστας Πακέτων"
@@ -2507,16 +2507,16 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
@@ -2608,15 +2608,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2625,7 +2625,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2634,7 +2634,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2642,7 +2642,7 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
@@ -2696,11 +2696,16 @@ msgstr "Σάρωση του δίσκου για περιεχόμενα...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Βρέθηκαν %i κατάλογοι πακέτων, %i κατάλογοι πηγαίων και %i υπογραφές\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Αποθήκευση Ετικέτας: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2709,20 +2714,21 @@ msgstr ""
"Ο δίσκος αυτός ονομάζεται: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Αντιγραφή λιστών πακέτων..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Eγγραφή νέας λίστας πηγών\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Αποπροσάρτηση του CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/en_GB.po b/po/en_GB.po
index 5c75b599f..decb2b629 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-12 11:07+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
@@ -1657,16 +1657,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Wrong CD-ROM"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Unable to unmount the CD-ROM in %s, it may still be in use."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk not found."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "File not found"
@@ -1803,7 +1803,7 @@ msgstr "Data socket connect timed out"
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
@@ -1937,76 +1937,76 @@ msgstr "Couldn't open pipe for %s"
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Internal error"
@@ -2079,12 +2079,12 @@ msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntax error %s:%u: Extra junk at end of file"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Error!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Done"
@@ -2380,7 +2380,7 @@ msgid ""
msgstr ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2388,7 +2388,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Unable to correct problems, you have held broken packages."
@@ -2404,12 +2404,12 @@ msgstr "Archive directory %spartial is missing."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Retrieving file %li of %li (%s remaining)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Retrieving file %li of %li"
@@ -2456,16 +2456,16 @@ msgstr "The package lists or status file could not be parsed or opened."
msgid "You may want to run apt-get update to correct these problems"
msgstr "You may want to run apt-get update to correct these problems"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Invalid record in the preferences file, no Package header"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Did not understand pin type %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "No priority (or zero) specified for pin"
@@ -2553,15 +2553,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "There is no public key available for the following key IDs:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2570,7 +2570,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2579,14 +2579,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:848
+#: apt-pkg/acquire-item.cc:855
#, 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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Size mismatch"
@@ -2640,11 +2640,16 @@ msgstr "Scanning disc for index files..\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Found %i package indexes, %i source indexes and %i signatures\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Stored label: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "That is not a valid name, try again.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2653,20 +2658,21 @@ msgstr ""
"This disc is called: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copying package lists..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Writing new source list\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Source list entries for this disc are:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Unmounting CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/es.po b/po/es.po
index 4f3122fec..4a6254005 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6.42.3exp1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-08 00:23+0200\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1689,16 +1689,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD equivocado"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
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
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disco no encontrado."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fichero no encontrado"
@@ -1835,7 +1835,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
@@ -1971,76 +1971,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:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, 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:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Mala lnea de cabecera"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor de http envi una cabecera de respuesta invlida"
-#: methods/http.cc:585
+#: methods/http.cc:586
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:600
+#: methods/http.cc:601
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:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "ste servidor de http tiene el soporte de alcance roto"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Fall la seleccin"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Expir la conexin"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerr la conexin."
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Fallo la conexin"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Error interno"
@@ -2115,12 +2115,12 @@ msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Error!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Hecho"
@@ -2420,7 +2420,7 @@ msgstr ""
"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
"ste."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2428,7 +2428,7 @@ msgstr ""
"Error, pkgProblemResolver::Resolve gener cortes, esto puede haber sido "
"causado por paquetes retenidos."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No se pudieron corregir los problemas, usted ha retenido paquetes\n"
@@ -2446,12 +2446,12 @@ msgstr "Falta el directorio de archivos %spartial."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Descargando fichero %li de %li (falta %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Descargando fichero %li de %li"
@@ -2499,17 +2499,17 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
"Registro invlido en el archivo de preferencias, no hay cabecera de paquete"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "No se entiende el pin tipo %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "No hay prioridad especificada para pin (o es cero)"
@@ -2602,17 +2602,17 @@ 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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave pblica disponible para los siguientes "
"identificadores de clave:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2622,7 +2622,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2631,7 +2631,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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2639,7 +2639,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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "El tamao difiere"
@@ -2693,11 +2693,16 @@ msgstr "Buscando en el disco archivos de ndices...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Se encontraron %i ndices de paquetes, %i de fuentes y %i firmas\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etiqueta guardada: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Ese no es un nombre vlido, intntelo de nuevo.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2706,20 +2711,21 @@ msgstr ""
"Este disco se llama: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copiando las listas de paquetes..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Escribiendo nueva lista de fuente\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Las entradas de la lista de fuentes para este disco son:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Desmontando CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/eu.po b/po/eu.po
index 924db9676..9658ab6d3 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:09+0200\n"
"PO-Revision-Date: 2006-09-27 13:59+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale <librezale@librezale.org>\n"
@@ -1666,17 +1666,17 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD okerra"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, 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."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Ez da diska aurkitu"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
@@ -1816,7 +1816,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1951,76 +1951,76 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
msgid "Read error from %s process"
msgstr "Irakurri errorea %s prozesutik"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Goiburuen zain"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Okerreko goiburu-lerroa"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du."
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "http zerbitzariak barruti onarpena apurturik du"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Datu-formatu ezezaguna"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Konexioaren denbora-muga gainditu da"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Barne-errorea"
@@ -2093,12 +2093,12 @@ msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Errorea!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Eginda"
@@ -2399,7 +2399,7 @@ msgid ""
msgstr ""
"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2407,7 +2407,7 @@ msgstr ""
"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
"atxikitako paketeek eraginda."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
@@ -2423,12 +2423,12 @@ msgstr "%spartial artxibo-direktorioa falta da."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li fitxategia jasotzen %li-tik"
@@ -2474,16 +2474,16 @@ msgstr "Pakete-zerrendak edo egoera-fitxategia ezin dira analizatu edo ireki."
msgid "You may want to run apt-get update to correct these problems"
msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Erregistro baliogabea hobespenen fitxategian, pakete-goibururik ez"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Ez da ulertu %s orratz-mota (pin)"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
@@ -2571,15 +2571,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
-msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n"
+msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2588,7 +2588,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2597,7 +2597,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2605,7 +2605,7 @@ msgstr ""
"Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
@@ -2659,11 +2659,16 @@ msgstr "Indize fitxategien bila diska arakatzen...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "%i pakete indize, %i jatorri indize eta %i sinadura aurkitu dira\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Aurkitutako Etiketa: '%s' \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Hau ez baliozko izen bat, froga berriro.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2672,21 +2677,21 @@ msgstr ""
"Diskaren izen:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Pakete zerrendak kopiatzen..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "jatorri zerrenda berria idazten\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Diskarentzako jaotrri sarrerak:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr "CD-ROM Desmuntatzen..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM Desmuntatzen...\n"
#: apt-pkg/indexcopy.cc:261
#, c-format
@@ -2762,3 +2767,6 @@ msgstr "%s guztiz ezabatu da"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Konexioa behar baino lehenago itxi da"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Ezin izan zaio fixtategiari adabakia ezarri"
diff --git a/po/fi.po b/po/fi.po
index 2b4093086..ae778b8d5 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-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-09-29 16:06+0300\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -1664,16 +1664,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Väärä romppu"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Rompun %s irrottaminen ei onnistu, se on ehkä käytössä."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Levyä ei löydy"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Tiedostoa ei löydy"
@@ -1810,7 +1810,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1946,76 +1946,76 @@ msgstr "Putkea %s ei voitu avata"
msgid "Read error from %s process"
msgstr "Prosessi %s ilmoitti lukuvirheestä"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2088,12 +2088,12 @@ msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\""
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Virhe!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Valmis"
@@ -2388,7 +2388,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2396,7 +2396,7 @@ msgstr ""
"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
"paketit."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
@@ -2412,12 +2412,12 @@ msgstr "Arkistokansio %spartial puuttuu."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Noudetaan tiedosto %li / %li"
@@ -2464,16 +2464,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Tunnistetyyppi %s on tuntematon"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
@@ -2562,15 +2562,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2579,7 +2579,7 @@ msgstr ""
"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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2588,7 +2588,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2596,7 +2596,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Koko ei täsmää"
@@ -2652,11 +2652,16 @@ msgstr ""
"Asennuspakettien hakemistoja löytyi %i, lähdekoodipakettien hakemistoja %i "
"ja allekirjoituksia %i\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Tallennettu nimio: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2665,20 +2670,21 @@ msgstr ""
"Tämä levy on: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopioidaan pakettiluetteloita..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Kirjoitetaan uusi lähdeluettelo\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Irrotetaan romppu..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/fr.po b/po/fr.po
index 76281d32f..ef2378fb6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,13 +3,13 @@
# French messages
#
# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
-"PO-Revision-Date: 2006-09-02 09:59+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
+"PO-Revision-Date: 2007-05-08 11:30+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -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:47
#, c-format
@@ -814,8 +810,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"
@@ -849,8 +844,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
@@ -921,8 +915,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."
@@ -984,8 +977,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
@@ -1039,8 +1031,7 @@ msgstr "Note, slectionne %s pour l'expression rationnelle %s\n"
#: cmdline/apt-get.cc:1546
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:1549
msgid ""
@@ -1220,8 +1211,7 @@ msgstr "Impossible de satisfaire les dpendances %s pour %s: %s"
#: cmdline/apt-get.cc:2356
#, 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:2360
msgid "Failed to process build dependencies"
@@ -1404,8 +1394,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."
@@ -1663,8 +1652,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
@@ -1700,18 +1688,18 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Mauvais cdrom"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Impossible de dmonter le cdrom dans %s, il doit toujours tre en cours "
"d'utilisation."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disque non trouv."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fichier non trouv"
@@ -1767,8 +1755,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
@@ -1805,8 +1792,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."
@@ -1850,7 +1836,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problme de hachage du fichier"
@@ -1943,12 +1929,10 @@ msgstr "Impossible d'accder au porte-cls:%s"
#: methods/gpgv.cc:100
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:204
-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."
@@ -1990,76 +1974,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:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Attente des fichiers d'en-tte"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, 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:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Mauvaise ligne d'en-tte"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
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:585
+#: methods/http.cc:586
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:600
+#: methods/http.cc:601
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:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ce serveur http possde un support des limites non-valide"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Slection dfaillante"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Dlai de connexion dpass"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Erreur d'criture du fichier de sortie"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Erreur d'criture sur un fichier"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Erreur d'criture sur le fichier"
-#: methods/http.cc:874
+#: methods/http.cc:875
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:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Mauvais en-tte de donne"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "chec de la connexion"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Erreur interne"
@@ -2134,12 +2118,12 @@ msgstr "Erreur syntaxique %s:%u: directive %s non tolre"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erreur syntaxique %s:%u: valeur aberrante la fin du fichier"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Erreur!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Fait"
@@ -2380,14 +2364,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
@@ -2407,14 +2389,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
@@ -2435,13 +2415,12 @@ 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."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2449,7 +2428,7 @@ msgstr ""
"Erreur, pkgProblemResolver::Resolve a gnr des ruptures, ce qui a pu tre "
"caus par les paquets devant tre gards en l'tat."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Impossible de corriger les problmes, des paquets dfecteux sont en mode "
@@ -2467,12 +2446,12 @@ msgstr "Le rpertoire d'archive %spartial n'existe pas."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Tlchargement du fichier %li de %li (%s restant)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Tlchargement du fichier %li de %li"
@@ -2510,8 +2489,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."
@@ -2523,18 +2501,18 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Vous pouvez lancer apt-get update pour corriger ces problmes."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
"Enregistrement invalide dans votre fichier prfrences, aucune entre "
"Package."
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "tiquette %s inconnue"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Aucune priorit (ou zro) n'a t spcifie pour l'tiquette"
@@ -2585,8 +2563,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."
@@ -2622,24 +2599,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Somme de contrle MD5 incohrente"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is 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"
+msgstr "Aucune cl publique n'est disponible pour la/les cl(s) suivante(s):\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2649,7 +2624,7 @@ msgstr ""
"sans doute que vous devrez corriger ce paquet manuellement (absence "
"d'architecture)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2658,15 +2633,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:848
+#: apt-pkg/acquire-item.cc:855
#, 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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Taille incohrente"
@@ -2720,11 +2694,16 @@ msgstr "Examen du disque la recherche de fichiers d'index...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "%i index de paquets trouvs, %i index de sources et %i signatures\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "tiquette %s trouve\n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Ce nom n'est pas valable, veuillez recommencer.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2733,21 +2712,21 @@ msgstr ""
"Ce disque s'appelle:\n"
"%s\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copie des listes de paquets..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "criture de la nouvelle liste de sources\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Les entres de listes de sources pour ce disque sont:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr "Dmontage du cdrom..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
+msgstr "Dmontage du cdrom...\n"
#: apt-pkg/indexcopy.cc:261
#, c-format
@@ -2825,8 +2804,3 @@ msgstr "%s compltement supprim"
msgid "Connection closed prematurely"
msgstr "Connexion ferme prmaturment"
-#~ msgid "File date has changed %s"
-#~ msgstr "La date du fichier a chang %s"
-
-#~ msgid "Could not patch file"
-#~ msgstr "Impossible de modifier (patch) %s"
diff --git a/po/gl.po b/po/gl.po
index bff17bd98..9331d6c8f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-19 11:37+0100\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-02-28 13:14+0100\n"
"Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -1676,16 +1676,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD-ROM incorrecto"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Non se puido desmontar o CD-ROM de %s, pode estarse empregando aínda."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Non se atopou o disco"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Non se atopou o ficheiro"
@@ -2429,12 +2429,12 @@ msgstr "O directorio de arquivos %spartial falla."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "A obter o ficheiro %li de %li (fallan %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "A obter o ficheiro %li de %li"
@@ -2481,18 +2481,18 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Pode querer executar apt-get update para corrixir estes problemas"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
"Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira "
"Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Non se entendeu o tipo de inmobilización %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
@@ -2581,16 +2581,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Os MD5Sum non coinciden"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is 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:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2599,7 +2599,7 @@ msgstr ""
"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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2608,7 +2608,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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2616,7 +2616,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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
@@ -2671,11 +2671,16 @@ msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
"Atopáronse %i índices de paquetes, %i índices de fontes e %i sinaturas\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etiqueta armacenada: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Ese non é un nome válido, volva tentalo.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2684,20 +2689,21 @@ msgstr ""
"Este disco chámase: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "A copiar as listas de paquetes..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "A gravar a nova lista de fontes\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "As entradas da lista de fontes deste disco son:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "A desmontar o CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/he.po b/po/he.po
index be496f151..52f686b8f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
@@ -1483,17 +1483,17 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr ""
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "(לא נמצא)"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr ""
@@ -1628,7 +1628,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1760,76 +1760,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr ""
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr ""
@@ -1902,12 +1902,12 @@ msgstr ""
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr ""
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr ""
@@ -2199,13 +2199,13 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
@@ -2221,12 +2221,12 @@ msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
@@ -2272,16 +2272,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -2369,35 +2369,35 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, 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:812
+#: apt-pkg/acquire-item.cc:819
#, 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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr ""
@@ -2449,31 +2449,36 @@ msgstr ""
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
msgstr ""
#: apt-pkg/indexcopy.cc:261
diff --git a/po/hu.po b/po/hu.po
index d810e311b..a22ff301b 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-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-21 11:04+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian>\n"
@@ -1665,16 +1665,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Hibás CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nem lehet lecsatolni az itt lévő CD-ROM-ot: %s, talán még használod."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Nem találom a lemezt"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Nem találom a fájlt"
@@ -1811,7 +1811,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1943,76 +1943,76 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
msgid "Read error from %s process"
msgstr "Olvasási hiba %s folyamattól"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, 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:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Rossz fejléc sor"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
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:585
+#: methods/http.cc:586
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:600
+#: methods/http.cc:601
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:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ez a http szerver támogatja a sérült tartományokat "
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:874
+#: methods/http.cc:875
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:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Belső hiba"
@@ -2086,12 +2086,12 @@ msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Hiba!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Kész"
@@ -2388,7 +2388,7 @@ msgid ""
msgstr ""
"A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2396,7 +2396,7 @@ msgstr ""
"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
"csomagok okozhatják."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren."
@@ -2413,12 +2413,12 @@ msgstr "%spartial archívumkönyvtár hiányzik."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li/%li fájl letöltése (%s marad)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li/%li fájl letöltése"
@@ -2465,16 +2465,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "A(z) %s tűtípus nem értelmezhető"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz"
@@ -2567,15 +2567,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2584,7 +2584,7 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2593,14 +2593,14 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, 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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
@@ -2654,11 +2654,16 @@ msgstr "Indexfájlok keresése a lemezen...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Tárolt címke: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "E név érvénytelen, próbáld újra.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2667,20 +2672,21 @@ msgstr ""
"E lemez neve: \n"
"%s\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Csomaglisták másolása..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Új forráslista írása\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM leválasztása..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/it.po b/po/it.po
index 0ea86d3da..ea4837445 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-12 09:27+0200\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -1684,16 +1684,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD-ROM sbagliato"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disco non trovato"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "File non trovato"
@@ -1831,7 +1831,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemi nella creazione dell'hash del file"
@@ -1969,77 +1969,77 @@ msgstr "Impossibile aprire una pipe per %s"
msgid "Read error from %s process"
msgstr "Errore di lettura dal processo %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, 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:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Linea nell'header non corretta"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Il server HTTP ha inviato un Content-Length non valido"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Il server HTTP ha inviato un Content-Range non valido"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Questo server HTTP ha il supporto del range bacato"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select fallito"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Tempo limite per la connessione esaurito"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Errore nella scrittura del file di output"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:874
+#: methods/http.cc:875
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:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Errore nella lettura dal server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Header dei dati malformato"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Connessione fallita"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Errore interno"
@@ -2114,12 +2114,12 @@ msgstr "Errore di sintassi %s:%u: Direttiva non supportata '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Errore!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Fatto"
@@ -2419,7 +2419,7 @@ msgstr ""
"Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un "
"archivio per esso."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2427,7 +2427,7 @@ msgstr ""
"Errore, pkgProblemResolver::Resolve ha generato uno stop, questo pu essere "
"causato da pacchetti bloccati "
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati"
@@ -2443,12 +2443,12 @@ msgstr "Manca la directory di archivio %spartial."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Scaricamento file %li di %li (%s rimanente)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Scaricamento file %li di %li"
@@ -2497,16 +2497,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr " consigliabile eseguire apt-get update per correggere questi problemi"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Campo non valido nel file delle preferenze, Manca \"Package header\""
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Impossibile capire il tipo di pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Nessuna (o zero) priorit specificata per il pin"
@@ -2601,16 +2601,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is 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:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2620,7 +2620,7 @@ msgstr ""
"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
"mancante)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2629,7 +2629,7 @@ msgstr ""
"Non stato possibile trovare file per il pacchetto %s. Questo significa che "
"bisogna correggere manualmente l'errore."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2637,7 +2637,7 @@ msgstr ""
"I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
@@ -2691,11 +2691,16 @@ msgstr "Scansione del disco alla ricerca di file indice, in corso..\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etichette salvate: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Questo non un nome valido, riprovare.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2704,20 +2709,21 @@ msgstr ""
"Questo disco chiamato: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copia della lista dei pacchetti in corso..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Scrittura di una nuova lista sorgenti in corso\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Le voci lista sorgenti per questo Disco sono:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Smontaggio CD-ROM in corso..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/ja.po b/po/ja.po
index 25cd22664..5aa09a7ba 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-09-08 19:57+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1677,16 +1677,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD が違います"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "%s の CD-ROM は使用中のためアンマウントすることができません。"
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "ディスクが見つかりません。"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "ファイルが見つかりません"
@@ -1823,7 +1823,7 @@ msgstr "データソケット接続タイムアウト"
msgid "Unable to accept connection"
msgstr "接続を accept できません"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ファイルのハッシュでの問題"
@@ -1956,76 +1956,76 @@ msgstr "%s に対してパイプを開けませんでした"
msgid "Read error from %s process"
msgstr "%s プロセスからの読み込みエラー"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "ヘッダの待機中です"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u 文字を超える 1 行のヘッダを取得しました"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "不正なヘッダ行です"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "http サーバが不正なリプライヘッダを送信してきました"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "http サーバのレンジサポートが壊れています"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "不明な日付フォーマットです"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "select に失敗しました"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "接続タイムアウト"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "出力ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "サーバからの読み込みに失敗しました"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "不正なヘッダです"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "接続失敗"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "内部エラー"
@@ -2098,12 +2098,12 @@ msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... エラー!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 完了"
@@ -2400,7 +2400,7 @@ msgstr ""
"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
"つけることができませんでした。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2408,7 +2408,7 @@ msgstr ""
"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
"ジが原因です。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
@@ -2424,12 +2424,12 @@ msgstr "アーカイブディレクトリ %spartial が見つかりません。"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "ファイルを取得しています %li/%li (残り %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "ファイルを取得しています %li/%li"
@@ -2481,18 +2481,18 @@ msgstr ""
"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
"せん"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr ""
"不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ"
"ん"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "pin タイプ %s が理解できませんでした"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "pin で優先度 (または 0) が指定されていません"
@@ -2580,15 +2580,15 @@ msgstr "ソースキャッシュの保存中に IO エラーが発生しまし
msgid "rename failed, %s (%s -> %s)."
msgstr "名前の変更に失敗しました。%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2597,7 +2597,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2606,7 +2606,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2614,7 +2614,7 @@ msgstr ""
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "サイズが適合しません"
@@ -2670,11 +2670,16 @@ msgstr ""
"%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし"
"た\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "格納されたラベル: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "これは有効な名前ではありません。再試行してください。\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2683,20 +2688,21 @@ msgstr ""
"このディスクは以下のように呼ばれます: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "パッケージリストをコピーしています ..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "新しいソースリストを書き込んでいます\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "このディスクのソースリストのエントリ:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM をアンマウントしています ..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/ko.po b/po/ko.po
index 500ee021e..1437d4d11 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-12 21:22-0400\n"
"Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1664,16 +1664,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "잘못된 CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 것입니다."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "디스크가 없습니다."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "파일이 없습니다"
@@ -1810,7 +1810,7 @@ msgstr "데이터 소켓 연결 시간 초과"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
@@ -1941,76 +1941,76 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
msgid "Read error from %s process"
msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "헤더를 기다리는 중입니다"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "헤더 줄이 잘못되었습니다"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "서버에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "내부 오류"
@@ -2083,12 +2083,12 @@ msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... 오류!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 완료"
@@ -2384,7 +2384,7 @@ msgid ""
msgstr ""
"%s 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2392,7 +2392,7 @@ msgstr ""
"오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수"
"도 있습니다."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다."
@@ -2408,12 +2408,12 @@ msgstr "아카이브 디렉토리 %spartial이 빠졌습니다."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "파일 받아오는 중: %2$li 중 %1$li"
@@ -2460,16 +2460,16 @@ msgstr "꾸러미 목록이나 상태 파일을 파싱할 수 없거나 열 수
msgid "You may want to run apt-get update to correct these problems"
msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 꾸러미 헤더가 없습니다"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "핀 타입 %s이(가0 무엇인지 이해할 수 없습니다"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
@@ -2557,15 +2557,15 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2574,7 +2574,7 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2583,14 +2583,14 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
@@ -2644,11 +2644,16 @@ msgstr "디스크에서 색인 파일을 찾는 중입니다...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "꾸러미 색인 %i개, 소스 색인 %i개, 시그너처 %i개 발견\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "저장된 레이블: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2657,20 +2662,21 @@ msgstr ""
"이 디스크는 다음과 같습니다: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "꾸러미 목록을 복사하는 중입니다..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "새 소스 리스트를 쓰는 중입니다\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM을 마운트 해제하는 중입니다..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/nb.po b/po/nb.po
index fe74b96cf..015b92a5f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-16 00:35+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
@@ -1678,18 +1678,18 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Feil CD-plate"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Klarer ikke avmontere CD-plata i %s. Det kan hende plata fremdeles er i "
"bruk."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk ikke funnet."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fant ikke fila"
@@ -1826,7 +1826,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke godta tilkoblingen"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 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:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Venter p hoder"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fikk en enkel hodelinje over %u tegn"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "delagt hodelinje"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har delagt sttte for omrde"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Tidsavbrudd p forbindelsen"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "delagte hodedata"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Intern feil"
@@ -2102,12 +2102,12 @@ msgstr "Syntaksfeil %s:%u: Direktivet %s er ikke stttet"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfeil %s:%u: Ugyldige angivelser p slutten av fila"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s ... Feil"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s ... Ferdig"
@@ -2403,7 +2403,7 @@ msgid ""
msgstr ""
"Pakka %s trenger installeres p nytt, men jeg finner ikke lageret for den."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2411,7 +2411,7 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
"som holdes tilbake."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Klarer ikke rette problemene, noen delagte pakker er holdt tilbake."
@@ -2427,12 +2427,12 @@ msgstr "Arkivmappa %spartial mangler."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Henter fil %li av %li (%s gjenvrende)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Henter fil %li av %li"
@@ -2480,16 +2480,16 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Det kan hende du vil kjre apt-get update for rette p disse problemene"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Forsto ikke spikring av typen %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) spesifisert for pin"
@@ -2577,16 +2577,16 @@ 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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2595,7 +2595,7 @@ msgstr ""
"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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2604,13 +2604,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:848
+#: apt-pkg/acquire-item.cc:855
#, 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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Feil strrelse"
@@ -2664,11 +2664,16 @@ msgstr "Leter gjennom CD for indeksfiler..\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Lagret merkelapp: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikke et gyldig navn, prv igjen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2677,20 +2682,21 @@ msgstr ""
"CD-en er kalt: \n"
"%s\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopierer pakkelister..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Skriver ny kildeliste\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Kildelisteoppfringer for denne CD-en er:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Avmonterer CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/nl.po b/po/nl.po
index 87b9750cf..e46f6b8f8 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-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-17 22:35+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -1692,17 +1692,17 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Verkeerde CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Kan de CD-ROM in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Schijf niet gevonden"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Bestand niet gevonden"
@@ -1839,7 +1839,7 @@ msgstr "Datasocket verbinding is verlopen"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -1978,79 +1978,79 @@ msgstr "Kon geen pijp openen voor %s"
msgid "Read error from %s process"
msgstr "Leesfout door proces %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Wachtend op de kopteksten"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
-#: methods/http.cc:585
+#: methods/http.cc:586
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:600
+#: methods/http.cc:601
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:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:874
+#: methods/http.cc:875
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:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Interne fout"
@@ -2125,12 +2125,12 @@ msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Fout!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Klaar"
@@ -2433,7 +2433,7 @@ msgstr ""
"Pakket %s moet opnieuw genstalleerd worden, maar er kan geen archief voor "
"gevonden worden."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2441,7 +2441,7 @@ msgstr ""
"Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
"veroorzaakt worden door vastgehouden pakketten."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
@@ -2457,12 +2457,12 @@ msgstr "Archiefmap %spartial is afwezig."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Bestand %li van %li wordt opgehaald"
@@ -2514,16 +2514,16 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ongeldige record in het voorkeurenbestand, geen 'Package'-koptekst"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Pintype %s wordt niet begrepen"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
@@ -2613,16 +2613,16 @@ 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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2631,7 +2631,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2640,7 +2640,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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2648,7 +2648,7 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
@@ -2702,11 +2702,16 @@ msgstr "Er wordt gescant voor indexbestanden...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "%i pakket-indexen gevonden, %i bron-indexen en %i handtekeningen\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Opgeslagen label: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2715,20 +2720,21 @@ msgstr ""
"De schijf heet:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Pakketlijsten worden gekopieerd..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Nieuwe bronlijst wordt weggeschreven\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD wordt afgekoppeld..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/nn.po b/po/nn.po
index 090e6417d..cfc588603 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-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -1670,18 +1670,18 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Feil CD-plate"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
"Klarte ikkje montera CD-plata i %s. Det kan henda plata framleis er i bruk."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "Fann ikkje fila"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fann ikkje fila"
@@ -1818,7 +1818,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1950,76 +1950,76 @@ msgstr "Klarte ikkje opna ryr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fr %s-prosessen"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Ventar p hovud"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fekk ei enkel hovudlinje over %u teikn"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "ydelagd hovudlinje"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Intern feil"
@@ -2092,12 +2092,12 @@ msgstr "Syntaksfeil %s:%u: Direktivet %s er ikkje sttta"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s ... Feil"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s ... Ferdig"
@@ -2393,7 +2393,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2401,7 +2401,7 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar "
"som er haldne tilbake."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake."
@@ -2418,12 +2418,12 @@ msgstr "Arkivkatalogen %spartial manglar."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Les filliste"
@@ -2473,16 +2473,16 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Du vil kanskje prva retta p desse problema ved kyra apt-get update."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Skjnar ikkje spikringstypen %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) oppgitt for spiker"
@@ -2570,15 +2570,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2587,7 +2587,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2595,14 +2595,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, 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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Feil storleik"
@@ -2656,11 +2656,16 @@ msgstr "Leitar etter indeksfiler p disken ...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Lagra etikett: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikkje eit gyldig namn, prv igjen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2669,20 +2674,21 @@ msgstr ""
"Disken vert kalla: \n"
"%s\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopierer pakkelister ..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Skriv ny kjeldeliste\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Kjeldelisteoppfringar for denne disken er:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Avmonterer CD-ROM ..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/pl.po b/po/pl.po
index 4518418ae..763ec3325 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\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"
@@ -1672,16 +1672,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Niewaciwa pyta CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
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
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Nie odnaleziono dysku."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Nie odnaleziono pliku"
@@ -1819,7 +1819,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie udao si obliczy skrtu pliku"
@@ -1954,76 +1954,76 @@ msgstr "Nie udao si otworzy potoku dla %s"
msgid "Read error from %s process"
msgstr "Bd odczytu z procesu %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Oczekiwanie na nagwki"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Otrzymano pojedyncz lini nagwka o dugoci ponad %u znakw"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Nieprawidowa linia nagwka"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Length"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Range"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Operacja select nie powioda si"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Przekroczenie czasu poczenia"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Bd przy pisaniu do pliku wyjciowego"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Bd czytania z serwera"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Bdne dane nagwka"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Poczenie nie udao si"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Bd wewntrzny"
@@ -2097,12 +2097,12 @@ msgstr "Bd skadniowy %s:%u: Nieobsugiwana dyrektywa '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Bd skadniowy %s:%u: mieci na kocu pliku"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Bd!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Gotowe"
@@ -2399,7 +2399,7 @@ msgid ""
msgstr ""
"Pakiet %s ma zosta przeinstalowany, ale nie mona znale jego archiwum."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2407,7 +2407,7 @@ msgstr ""
"Bd, pkgProblemResolver::Resolve zwrci bd, moe to by spowodowane "
"\"zatrzymanymi\" pakietami."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nie udao si naprawi problemw, zatrzymano uszkodzone pakiety."
@@ -2423,12 +2423,12 @@ msgstr "Brakuje katalogu archiww %spartial."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, fuzzy, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Pobieranie pliku %li z %li (%s pozostao)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Czytanie listy plikw"
@@ -2474,16 +2474,16 @@ msgstr "Nie udao si otworzy lub zanalizowa zawartoci list pakietw."
msgid "You may want to run apt-get update to correct these problems"
msgstr "Naley uruchomi apt-get update aby naprawi te problemy."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Nieprawidowy rekord w pliku ustawie, brak nagwka Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nierozpoznany typ przypinania %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Brak (lub zerowy) priorytet przypicia"
@@ -2574,16 +2574,16 @@ 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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Bdna suma MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
#, fuzzy
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla nastpujcego identyfikatora klucza brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2592,7 +2592,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2601,14 +2601,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:848
+#: apt-pkg/acquire-item.cc:855
#, 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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Bdny rozmiar"
@@ -2664,11 +2664,16 @@ msgstr ""
"Znaleziono %i indeksw pakietw, %i indeksw rdowych, %i indeksw "
"tumacze i %i sygnatur\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etykieta: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "To nie jest prawidowa nazwa, sprbuj ponownie.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2677,20 +2682,21 @@ msgstr ""
"Pyta nosi nazw: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopiowanie list pakietw..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Zapisywanie nowej listy rde\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "rda dla tej pyty to:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Odmontowanie CD-ROMu..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/pt.po b/po/pt.po
index f7b1ca306..3f68b09b1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,15 +1,15 @@
# Debian-PT translation for apt.
# Copyright (C) 2004 Free Software Foundation, Inc.
-# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006.
+# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006, 2007.
#
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
-"PO-Revision-Date: 2006-10-14 21:55+0100\n"
-"Last-Translator: Rui Az. <astronomy@mail.pt>\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
+"PO-Revision-Date: 2007-05-09 22:14+0100\n"
+"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1676,16 +1676,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD errado"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disco não encontrado"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Arquivo não encontrado"
@@ -1822,7 +1822,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do ficheiro"
@@ -1960,76 +1960,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:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, 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:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor http enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:585
+#: methods/http.cc:586
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:600
+#: methods/http.cc:601
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:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range errado"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select falhou."
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "A ligação expirou"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Erro gravando para ficheiro de saída"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Erro gravando para ficheiro"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Erro gravando para o ficheiro"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Falhou a ligação"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Erro interno"
@@ -2103,12 +2103,12 @@ msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Erro !"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Pronto"
@@ -2407,7 +2407,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"repositório para o mesmo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2415,7 +2415,7 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados."
@@ -2431,12 +2431,12 @@ msgstr "Falta o directório de repositório %spartial."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "A obter o ficheiro %li de %li (%s restantes)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "A obter o ficheiro %li·of·%li"
@@ -2486,16 +2486,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Você terá que executar apt-get update para corrigir estes problemas"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Pacote"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Não foi possível entender o tipo de marca %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para marcação"
@@ -2588,17 +2588,17 @@ 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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Não existe qualquer chave pública disponível para as seguintes IDs de "
"chave:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2608,7 +2608,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitectura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2617,7 +2617,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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2625,7 +2625,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
@@ -2679,11 +2679,16 @@ msgstr "A pesquisar os ficheiros de index do Disco..\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Encontrada etiqueta '%s'\n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Isso não é um nome válido, tente de novo.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2692,21 +2697,21 @@ msgstr ""
"Este Disco tem o nome: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "A copiar listas de pacotes..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "A escrever lista de novas source\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "As entradas de listas de Source para este Disco são:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
-msgstr "A desmontar o CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
+msgstr "A desmontar o CD-ROM...\n"
#: apt-pkg/indexcopy.cc:261
#, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4de48eca4..a0e38072f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-08-21 00:40-0300\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1675,16 +1675,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD-ROM errado"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disco não encontrado."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Arquivo não encontrado"
@@ -1821,7 +1821,7 @@ msgstr "Conexão do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar conexão"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do arquivo"
@@ -1959,76 +1959,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:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, 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:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Linha de cabeçalho ruim"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP possui suporte a range quebrado"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Seleção falhou"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Erro gravando para arquivo de saída"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Erro gravando para arquivo"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Erro gravando para o arquivo"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Conexão falhou"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Erro interno"
@@ -2102,12 +2102,12 @@ msgstr "Erro de sintaxe %s:%u: Diretiva '%s' não suportada"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Erro!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Pronto"
@@ -2407,7 +2407,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"arquivo para o mesmo."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2415,7 +2415,7 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
@@ -2431,12 +2431,12 @@ msgstr "Diretório de repositório %spartial está faltando."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Obtendo o arquivo %li de %li (%s restantes)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Obtendo arquivo %li de %li"
@@ -2486,16 +2486,16 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr "Você terá que executar apt-get update para corrigir esses problemas"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Não foi possível entender o tipo de pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para pin"
@@ -2588,15 +2588,15 @@ msgstr "Erro de I/O ao gravar cache fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeação falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2606,7 +2606,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2615,7 +2615,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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2623,7 +2623,7 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Tamanho incorreto"
@@ -2679,11 +2679,16 @@ msgstr ""
"Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i "
"assinaturas\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Rótulo armazenado: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Este não é um nome válido, tente novamente.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2692,20 +2697,21 @@ msgstr ""
"Esse disco é chamado: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copiando lista de pacotes..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Gravando nova lista de fontes\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Entradas na lista de fontes para este disco são:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Desmontando CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/ro.po b/po/ro.po
index 61ae77a86..42c1e02af 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-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-09-19 01:35+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -1683,16 +1683,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD-ROM necorespunzător"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disc negăsit."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Fişier negăsit"
@@ -1829,7 +1829,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la indexarea fişierului"
@@ -1965,77 +1965,77 @@ msgstr "Nu pot deschide conexiunea pentru %s"
msgid "Read error from %s process"
msgstr "Eroare de citire din procesul %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "În aşteptarea antetelor"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Primit o singură linie de antet peste %u caractere"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Serverul http a trimis un antet de răspuns necorespunzător"
-#: methods/http.cc:585
+#: methods/http.cc:586
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:600
+#: methods/http.cc:601
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:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Acest server http are zonă de suport necorespunzătoare"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Format de date necunoscut"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Eşuarea selecţiei"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Eroare la scrierea fişierului de rezultat"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Eroare la scrierea în fişier"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fişierul"
-#: methods/http.cc:874
+#: methods/http.cc:875
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:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Eroare la citirea de pe server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Conectare eşuată"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Eroare internă"
@@ -2109,12 +2109,12 @@ msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârşitul fişierului"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Eroare!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Terminat"
@@ -2412,7 +2412,7 @@ msgid ""
msgstr ""
"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2420,7 +2420,7 @@ msgstr ""
"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
"cauzată de pachete ţinute."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nu pot corecta problema, aţi ţinut pachete deteriorate."
@@ -2436,12 +2436,12 @@ msgstr "Directorul de arhive %spartial lipseşte."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Se descarcă fişierul %li din %li (%s rămas)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Se descarcă fişierul %li din %li"
@@ -2491,16 +2491,16 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr ""
"Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Înregistrare invalidă în fişierul de preferinţe, fără antet de pachet"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nu s-a înţeles tipul de pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Fără prioritate (sau zero) specificată pentru pin"
@@ -2593,17 +2593,17 @@ 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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Nu există nici o cheie publică disponibilă pentru următoarele "
"identificatoare de chei:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2612,7 +2612,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2621,7 +2621,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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2629,7 +2629,7 @@ msgstr ""
"Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
@@ -2683,11 +2683,16 @@ msgstr "Scanez discul de fişierele index..\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Găsite %i indexuri de pachete, %i indexuri de surse şi %i semnături\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etichetă memorată: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Acesta nu este un nume valid, mai încercaţi.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2696,20 +2701,21 @@ msgstr ""
"Acest disc este numit: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Copiez listele de pachete.."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Scriere noua listă sursă\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Intrările listei surselor pentru acest disc sunt:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Demontez CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/ru.po b/po/ru.po
index 4562c9803..a5e8813ec 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.6.46.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 17:45+0000\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-01-03 23:33+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -20,7 +20,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: cmdline/apt-cache.cc:135
@@ -335,7 +336,8 @@ msgstr ""
#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
-msgstr "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
+msgstr ""
+"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
#: ftparchive/apt-ftparchive.cc:401
#, c-format
@@ -453,8 +455,8 @@ msgid ""
"DB format is invalid. If you upgraded from a older version of apt, please "
"remove and re-create the database."
msgstr ""
-"Некорректный формат базы данных (DB). Если вы обновляли версию apt, "
-"удалите и создайте базу данных заново."
+"Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите "
+"и создайте базу данных заново."
#: ftparchive/cachedb.cc:81
#, c-format
@@ -602,7 +604,8 @@ 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"
@@ -720,7 +723,8 @@ msgstr "Пакеты, будут заменены на более СТАРЫЕ
#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
-msgstr "Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
+msgstr ""
+"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
#: cmdline/apt-get.cc:538
#, c-format
@@ -850,12 +854,14 @@ 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:1989
#, c-format
@@ -937,7 +943,8 @@ 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
@@ -1393,10 +1400,12 @@ 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 ""
"важны только ошибки, указанные выше. Исправьте их и выполните установку ещё "
"раз"
@@ -1593,8 +1602,9 @@ 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
@@ -1687,26 +1697,25 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Ошибочный CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Невозможно размонтировать CD-ROM в %s, возможно он ещё используется."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Диск не найден."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Файл не найден"
#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
+#: methods/gzip.cc:150
msgid "Failed to stat"
msgstr "Не удалось получить атрибуты"
#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
-#: methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Не удалось установить время модификации"
@@ -1838,7 +1847,7 @@ msgstr "Время установления соединения для соке
msgid "Unable to accept connection"
msgstr "Невозможно принять соединение"
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема при хешировании файла"
@@ -1915,7 +1924,8 @@ msgstr "Временная ошибка при попытке получить I
#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)"
+msgstr ""
+"Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)"
#: methods/connect.cc:223
#, c-format
@@ -1934,7 +1944,8 @@ msgstr ""
"работы."
#: methods/gpgv.cc:204
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
"ключа?!"
@@ -1960,7 +1971,8 @@ 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:64
#, c-format
@@ -1972,76 +1984,76 @@ msgstr "Не удалось открыть канал для %s"
msgid "Read error from %s process"
msgstr "Ошибка чтения из процесса %s"
-#: methods/http.cc:375
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Ожидание заголовков"
-#: methods/http.cc:521
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен заголовок длиннее %u символов"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Неверный заголовок"
-#: methods/http.cc:548 methods/http.cc:555
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-сервер послал неверный заголовок"
-#: methods/http.cc:584
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http сервер послал неверный заголовок Content-Length"
-#: methods/http.cc:599
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-сервер послал неверный заголовок Content-Range"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
-#: methods/http.cc:625
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Неизвестный формат данных"
-#: methods/http.cc:772
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:777
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Время ожидания для соединения истекло"
-#: methods/http.cc:800
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Ошибка записи в выходной файл"
-#: methods/http.cc:831
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:859
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:873
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтения, удалённый сервер прервал соединение"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:1106
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/http.cc:1123
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1214
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Внутренняя ошибка"
@@ -2218,7 +2230,8 @@ 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
@@ -2238,7 +2251,8 @@ 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
@@ -2356,7 +2370,8 @@ 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
@@ -2417,10 +2432,12 @@ 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."
-msgstr "Пакет %s нуждается в переустановке, но найти архив для него не удалось."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Пакет %s нуждается в переустановке, но найти архив для него не удалось."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2428,7 +2445,7 @@ msgstr ""
"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
"может быть вызвано отложенными (held) пакетами."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
@@ -2444,12 +2461,12 @@ msgstr "Архивный каталог %spartial отсутствует."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Загружается файл %li из %li (%s осталось)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Загружается файл %li из %li"
@@ -2495,16 +2512,16 @@ msgstr "Списки пакетов или status-файл не могут бы
msgid "You may want to run apt-get update to correct these problems"
msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Неверная запись в файле preferences: отсутствует заголовок Package"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Неизвестный тип фиксации %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Для фиксации не указан приоритет (или указан нулевой)"
@@ -2587,44 +2604,44 @@ msgstr "Сбор информации о Provides"
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов"
-#: apt-pkg/acquire-item.cc:130
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:410 apt-pkg/acquire-item.cc:660
-#: apt-pkg/acquire-item.cc:1375
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:1070
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен общий ключ для следующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1183
+#: apt-pkg/acquire-item.cc:760
#, 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. Это может означать, что вам "
-"придётся вручную исправить этот пакет (возможно, пропущен arch)"
+"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
+"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1242
+#: apt-pkg/acquire-item.cc:819
#, 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:1278
+#: apt-pkg/acquire-item.cc:855
#, 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:1365
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Не совпадает размер"
@@ -2680,11 +2697,16 @@ msgstr ""
"Найдено индексов: %i для пакетов, %i для пакетов c исходными текстами\n"
"и %i для сигнатур\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Найдена метка: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Это неправильное имя, попробуйте ещё раз.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2693,20 +2715,21 @@ msgstr ""
"Название диска: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Копирование списков пакетов..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Запись нового списка источников\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Записи в списке источников для этого диска:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Размонтирование CD-ROM..."
#: apt-pkg/indexcopy.cc:261
@@ -2781,11 +2804,9 @@ msgstr "Подготовка к полному удалению %s"
msgid "Completely removed %s"
msgstr "%s полностью удалён"
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Не удалось пропатчить файл"
-
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Соединение закрыто преждевременно"
+#~ msgid "Could not patch file"
+#~ msgstr "Не удалось пропатчить файл"
diff --git a/po/sk.po b/po/sk.po
index bb9344e4d..87514e27b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-09-10 18:50+0200\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -1658,16 +1658,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Chybné CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk sa nenašiel."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Súbor sa nenašiel"
@@ -1804,7 +1804,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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashovaním súboru"
@@ -1939,76 +1939,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:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Čaká sa na hlavičky"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, 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:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP server poslal neplatnú hlavičku odpovede"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -2082,12 +2082,12 @@ msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Chyba!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Hotovo"
@@ -2382,7 +2382,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Je nutné preinštalovať balík %s, ale nemôžem pre neho nájsť archív."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2390,7 +2390,7 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
"pridržanými balíkmi."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
@@ -2406,12 +2406,12 @@ msgstr "Archívny adresár %spartial chýba."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Sťahuje sa %li. súbor z %li"
@@ -2457,16 +2457,16 @@ msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvor
msgid "You may want to run apt-get update to correct these problems"
msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Neplatný záznam v súbore preferencií, žiadne záhlavie balíka"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nezrozumiteľné pripevnenie typu %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita"
@@ -2556,15 +2556,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súčtov"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is 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:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2573,7 +2573,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2582,13 +2582,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:848
+#: apt-pkg/acquire-item.cc:855
#, 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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
@@ -2643,11 +2643,16 @@ msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
"Nájdených %i indexov balíkov, %i indexov zdrojových balíkov a %i signatúr\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Uložená menovka: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Neplatný názov, skúste znova.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2656,20 +2661,21 @@ msgstr ""
"Názov tohto disku je: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopírujú sa zoznamy balíkov..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Zapisuje sa nový zoznam zdrojov\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "CD-ROM sa odpája..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/sl.po b/po/sl.po
index a550c1dab..ddce35520 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-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -1661,17 +1661,17 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Napaen C"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Ni mogoe odklopiti CD-ROM-a v %s, ker je morda e v uporabi."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
#, fuzzy
msgid "Disk not found."
msgstr "Datoteke ni mogoe najti"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Datoteke ni mogoe najti"
@@ -1808,7 +1808,7 @@ msgstr "Povezava podatkovne vtinice potekla"
msgid "Unable to accept connection"
msgstr "Ni mogoe sprejeti povezave"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Teava pri razprevanju datoteke"
@@ -1940,76 +1940,76 @@ msgstr "Ni mogoe odprti %s"
msgid "Read error from %s process"
msgstr "Napaka pri branju iz procesa %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "akanje na glave"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Napana vrstica glave"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Strenik HTTP je poslal napano glavo odgovora"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Ta strenik HTTP ima pokvarjen obseg podpore"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "as za povezavo se je iztekel"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika "
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Napaka pri branju s strenika"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Napani podatki glave"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Notranja napaka"
@@ -2083,12 +2083,12 @@ msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s ... Napaka!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Narejeno"
@@ -2384,7 +2384,7 @@ msgid ""
msgstr ""
"Paket %s mora biti ponovno nameen, vendar ne morem najti arhiva zanj."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2392,7 +2392,7 @@ msgstr ""
"Napaka. pkgProblemResolver::Napake pri razreitvi, ki so jih morda "
"povzroili zadrani paketi."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ni mogoe popraviti teav. Imate zadrane pakete."
@@ -2408,12 +2408,12 @@ msgstr "Manjka imenik z arhivi %spartial."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Branje seznama datotek"
@@ -2462,16 +2462,16 @@ msgstr "Ni mogoe odprti ali razleniti seznama paketov ali datoteke stanja."
msgid "You may want to run apt-get update to correct these problems"
msgstr "e elite odpraviti teave, poskusite zagnati apt-get update."
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Napaen zapis v datoteki z nastavitvami. Ni glave paketa"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Ni mogoe razumeti vrste zaponke %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Prioriteta zaponke ni doloena ali pa je ni."
@@ -2559,15 +2559,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2576,7 +2576,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2585,7 +2585,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2593,7 +2593,7 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
"%s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
@@ -2647,11 +2647,16 @@ msgstr "Preverjam medij za datoteke s kazalom..\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Nael sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Shranjena oznaka: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "To ni veljavno ime, poskusite e enkrat.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2660,20 +2665,21 @@ msgstr ""
"Ta medij se imenuje: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopiranje seznama paketov..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Piem nov seznam virov\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Izvorni vnosi za ta medij so:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Odklapljam CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/sv.po b/po/sv.po
index 4e262f739..66863c0de 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-08-18 15:45+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -1679,16 +1679,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Fel cd"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande anvnds."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Disk ej funnen."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Filen ej funnen"
@@ -1825,7 +1825,7 @@ 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:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lgga filen till hashtabellen"
@@ -1965,76 +1965,76 @@ msgstr "Kunde inte ppna rr fr %s"
msgid "Read error from %s process"
msgstr "Lsfel p %s-processen"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Vntar p huvuden"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fick en ensam huvudrad p %u tecken"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Trasig huvudrad"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-servern snde ett ogiltigt svarshuvud"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-servern snde ett ogiltigt Content-Length-huvud"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-servern snde ett ogiltigt Content-Range-huvud"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Denna http-servers std fr delvis hmtning fungerar inte"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Oknt datumformat"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Tidsgrnsen fr anslutningen nddes"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Fel vid lsning frn server"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Trasigt data i huvud"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Anslutning misslyckades"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Internt fel"
@@ -2107,12 +2107,12 @@ msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stds ej"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfel %s:%u: verfldigt skrp vid filens slut"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Fel!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Frdig"
@@ -2413,7 +2413,7 @@ msgid ""
msgstr ""
"Paketet %s mste installeras om, men jag kan inte hitta ngot arkiv fr det."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2421,7 +2421,7 @@ msgstr ""
"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p "
"hllna paket."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kunde inte korrigera problemen, du har hllt trasiga paket."
@@ -2437,12 +2437,12 @@ msgstr "Arkivkatalogen %spartial saknas."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Hmtar fil %li av %li (%s terstr)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Hmtar fil %li av %li"
@@ -2490,16 +2490,16 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr "Du kan mjligen rtta till problemet genom att kra \"apt-get update\""
# "Package" r en strng i instllningsfilen
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Ogiltig post i instllningsfilen, \"Package\"-huvud saknas"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Frstod inte nltypen %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Prioritet ej angiven (eller noll) fr nl"
@@ -2589,15 +2589,15 @@ 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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumma stmmer inte"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is 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:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2606,7 +2606,7 @@ 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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2615,13 +2615,13 @@ 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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Storleken stmmer inte"
@@ -2675,11 +2675,16 @@ msgstr "Sker efter indexfiler p disken...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "Hittade %i paketindex, %i kllkodsindex och %i signaturer\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etikett: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Namnet r ogiltigt, frsk igen.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2688,20 +2693,21 @@ msgstr ""
"Denna skiva heter: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kopierar paketlistor..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Skriver ny kllista\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Poster i kllistan fr denna skiva:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Avmonterar cd-rom..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/tl.po b/po/tl.po
index e27074d5b..07b1702fa 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-12-19 11:37+0100\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -1683,16 +1683,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "Maling CD"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "Hindi mai-unmount ang CD-ROM sa %s, maaaring ginagamit pa ito."
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Hindi nahanap ang Disk."
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
@@ -2443,12 +2443,12 @@ msgstr "Nawawala ang directory ng arkibo %spartial."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Kinukuha ang talaksang %li ng %li"
@@ -2498,16 +2498,16 @@ msgstr ""
"Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang "
"ito"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Hindi naintindihan ang uri ng pin %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
@@ -2597,15 +2597,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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2614,7 +2614,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2623,7 +2623,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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2631,7 +2631,7 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Di tugmang laki"
@@ -2687,11 +2687,16 @@ msgstr ""
"Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
"signature\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Naka-imbak na Label: %s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "Hindi yan tanggap na pangalan, subukan muli.\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2700,20 +2705,21 @@ msgstr ""
"Ang Disc na ito ay nagngangalang: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Kinokopya ang Listahan ng mga Pakete"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "Ina-unmount ang CD-ROM..."
#: apt-pkg/indexcopy.cc:261
diff --git a/po/vi.po b/po/vi.po
index 84135e8df..a107b0397 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,20 +1,20 @@
# Vietnamese Translation for Apt.
# This file is put in the public domain.
-# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006.
+# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006, 2007.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
-"PO-Revision-Date: 2006-09-21 17:16+0930\n"
+"POT-Creation-Date: 2007-05-08 11:09+0200\n"
+"PO-Revision-Date: 2007-06-01 15:00+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
"MIME-Version: 1.0\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.6fc1\n"
+"X-Generator: LocFactoryEditor 1.6.3b1\n"
#: cmdline/apt-cache.cc:135
#, c-format
@@ -1709,16 +1709,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "CD không đúng"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
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
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "Không tìm thấy đĩa"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Không tìm thấy tập tin"
@@ -1855,7 +1855,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ"
msgid "Unable to accept connection"
msgstr "Không thể chấp nhận kết nối"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Gặp khó khăn băm tập tin"
@@ -1988,80 +1988,80 @@ msgstr "Không thể mở ống dẫn cho %s"
msgid "Read error from %s process"
msgstr "Gặp lỗi đọc từ tiến trình %s"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "Đang đợi những phần đầu..."
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "Dòng đầu sai"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
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:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"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:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"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:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "Không biết dạng ngày"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Việc chọn bị lỗi"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "Kết nối đã quá giờ"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "Gặp lỗi khi ghi vào tập tin xuất"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "Gặp lỗi khi ghi vào tập tin đó"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "Gặp lỗi khi đọc từ máy phục vụ"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "Dữ liệu dòng đầu sai"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "Kết nối bị ngắt"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
@@ -2134,12 +2134,12 @@ msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »"
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"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Lỗi."
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Xong"
@@ -2438,7 +2438,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó."
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2446,7 +2446,7 @@ 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."
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt."
@@ -2462,12 +2462,12 @@ msgstr "Thiếu thư mục kho « %spartial »."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Đang lấy tập tin %li trên %li (%s còn lại)..."
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Đang lấy tập tin %li trên %li..."
@@ -2516,18 +2516,18 @@ 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 » (lấy cập nhật) để sửa các vấn đề này"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
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 Package "
"(Gói)."
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "Không hiểu kiểu ghim %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
@@ -2617,15 +2617,15 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
msgid "rename failed, %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:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5Sum (tổng kiểm) không khớp được"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is 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:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2634,7 +2634,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:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2643,7 +2643,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."
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2651,7 +2651,7 @@ msgstr ""
"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:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "Kích cỡ không khớp được"
@@ -2705,11 +2705,16 @@ msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
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
+#: apt-pkg/cdrom.cc:683
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Nhãn đã lưu : « %s »\n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
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
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2718,21 +2723,21 @@ msgstr ""
"Tên đĩa này:\n"
"%s\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "Đang sao chép các danh sách gói..."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "Đang ghi danh sách nguồn mới...\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
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 "Đang tháo lắp đĩa CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+msgid "Unmounting CD-ROM...\n"
+msgstr "Đang tháo lắp đĩa CD-ROM...\n"
#: apt-pkg/indexcopy.cc:261
#, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1f48d1baa..439e058a9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.23\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-19 11:37+0100\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2007-03-29 17:14+0800\n"
"Last-Translator: Kov Chai <tchaikov@sjtu.org>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -1629,12 +1629,12 @@ msgstr "无法在打包文件中找到有效的主控文件"
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
-#: methods/cdrom.cc:115
+#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr "无法读取光盘数据库 %s"
-#: methods/cdrom.cc:124
+#: 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"
@@ -1642,7 +1642,7 @@ msgstr ""
"请使用 apt-cdrom,通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
"加入新的光盘。"
-#: methods/cdrom.cc:132
+#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
msgstr "错误的光盘"
@@ -2390,12 +2390,12 @@ msgstr "找不到“%spartial”这个目录。"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在下载 %li 个文件中的第 %li 个(还有 %s 个)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下载 %2$li 个文件中的 %1$li 个"
@@ -2441,16 +2441,16 @@ msgstr "无法解析或打开软件包的列表或是状态文件。"
msgid "You may want to run apt-get update to correct these problems"
msgstr "您可能需要运行 apt-get update 来解决这些问题"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "偏好设定(preferences)文件中发现有无效的记录,无 Package 字段头"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型(pin type) %s"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
@@ -2538,15 +2538,15 @@ msgstr "无法写入来源缓存文件"
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2555,7 +2555,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2563,13 +2563,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "大小不符"
@@ -2587,47 +2587,52 @@ msgstr ""
"现把 %s 作为了 CD-ROM 的挂载点\n"
"正在挂载 CD-ROM\n"
-#: apt-pkg/cdrom.cc:518 apt-pkg/cdrom.cc:600
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr "正在鉴别.. "
-#: apt-pkg/cdrom.cc:543
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr "存档标签:%s \n"
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:581
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr "正在卸载 CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
msgstr "等待插入盘片……\n"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:593
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:611
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr "正在光盘中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:649
+#: apt-pkg/cdrom.cc:647
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "找到了 %i 个软件包索引、%i 个源代码包索引,和 %i 个数字签名\n"
-#: apt-pkg/cdrom.cc:714
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "存档标签:%s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "这不是一个有效的名字,请再次命名。\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2636,20 +2641,21 @@ msgstr ""
"这张光盘现在的名字是:\n"
"“%s”\n"
-#: apt-pkg/cdrom.cc:734
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:758
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "正在写入新的软件包源列表\n"
-#: apt-pkg/cdrom.cc:767
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "对应于该光盘的软件包源设置项是:\n"
-#: apt-pkg/cdrom.cc:810
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "正在卸载 CD-ROM 文件系统……"
#: apt-pkg/indexcopy.cc:261
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6206dfa99..3b1329fab 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-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+0200\n"
"PO-Revision-Date: 2006-10-21 16:58+0800\n"
"Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
"Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -1648,16 +1648,16 @@ msgstr ""
msgid "Wrong CD-ROM"
msgstr "碟片不正確。"
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr "無法下駕『%s』內的碟片,或許它仍在使用中。"
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
msgid "Disk not found."
msgstr "找不到磁碟"
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "找不到檔案"
@@ -1792,7 +1792,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法允許連線"
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "問題雜湊表"
@@ -1923,76 +1923,76 @@ msgstr "無法開啟管線給 %s 使用"
msgid "Read error from %s process"
msgstr "從 %s 進程讀取錯誤"
-#: methods/http.cc:376
+#: methods/http.cc:377
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/http.cc:522
+#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
msgstr "取得一個單行超過 %u 字元的標頭"
-#: methods/http.cc:530
+#: methods/http.cc:531
msgid "Bad header line"
msgstr "壞的標頭"
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
msgstr "http 伺服器傳送一個無效的回覆標頭"
-#: methods/http.cc:585
+#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
-#: methods/http.cc:600
+#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
-#: methods/http.cc:602
+#: methods/http.cc:603
msgid "This HTTP server has broken range support"
msgstr "http 伺服器有損毀的範圍支援"
-#: methods/http.cc:626
+#: methods/http.cc:627
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:773
+#: methods/http.cc:774
msgid "Select failed"
msgstr "Select 失敗"
-#: methods/http.cc:778
+#: methods/http.cc:779
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:801
+#: methods/http.cc:802
msgid "Error writing to output file"
msgstr "寫入輸出檔時發生錯誤"
-#: methods/http.cc:832
+#: methods/http.cc:833
msgid "Error writing to file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:860
+#: methods/http.cc:861
msgid "Error writing to the file"
msgstr "寫入檔案時發生錯誤"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
msgstr "從遠端主機讀取錯誤,關閉連線"
-#: methods/http.cc:876
+#: methods/http.cc:877
msgid "Error reading from server"
msgstr "從伺服器讀取發生錯誤"
-#: methods/http.cc:1107
+#: methods/http.cc:1108
msgid "Bad header data"
msgstr "壞的標頭資料"
-#: methods/http.cc:1124
+#: methods/http.cc:1125
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1215
+#: methods/http.cc:1216
msgid "Internal error"
msgstr "內部錯誤"
@@ -2065,12 +2065,12 @@ msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'"
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾"
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... 錯誤!"
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... 完成"
@@ -2364,13 +2364,13 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "套件『%s』需要重新安裝,但找不到軟件檔案。"
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr "無法解決依存關係。可能原因是某些套件被押後。"
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
msgid "Unable to correct problems, you have held broken packages."
msgstr "無法解決問題,因為某些損毀的套件被押後。"
@@ -2386,12 +2386,12 @@ msgstr "找不到『%spartial』檔案目錄。"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在下載第 %li 個文件(共 %li 個,尚需 %s)"
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下載第%li個檔案(共有%li)"
@@ -2437,16 +2437,16 @@ msgstr "無法讀取套件清單或狀況檔。"
msgid "You may want to run apt-get update to correct these problems"
msgstr "用『apt-get -f install』指令或許能修正這些問題。"
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
msgid "Invalid record in the preferences file, no Package header"
msgstr "喜好檔有錯誤—缺少套件前置檔。"
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
#, c-format
msgid "Did not understand pin type %s"
msgstr "本軟體不支持『%s』型的版本釘子。"
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
msgid "No priority (or zero) specified for pin"
msgstr "對於釘住的檔案無優先順序"
@@ -2534,35 +2534,35 @@ msgstr "無法寫入來源暫存檔。"
msgid "rename failed, %s (%s -> %s)."
msgstr "檔名因『%s』更換失敗 (%s → %s)。"
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼不符合。"
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 key ID 沒有可用的公鑰:\n"
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
#, 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:812
+#: apt-pkg/acquire-item.cc:819
#, 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:848
+#: apt-pkg/acquire-item.cc:855
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
msgid "Size mismatch"
msgstr "檔案大小不符合。"
@@ -2616,11 +2616,16 @@ msgstr "掃描碟片中的索引檔案..\n"
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr "找到 %i 個套件索引,%i 源碼索引和 %i 簽名\n"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "保存標誌:%s \n"
+
+#: apt-pkg/cdrom.cc:712
msgid "That is not a valid name, try again.\n"
msgstr "這不是合法名稱,重試一下。\n"
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
#, c-format
msgid ""
"This disc is called: \n"
@@ -2629,20 +2634,21 @@ msgstr ""
"這個碟片名為:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
msgid "Copying package lists..."
msgstr "複製套件清單中"
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
msgid "Writing new source list\n"
msgstr "寫入新的來源列表中\n"
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
msgid "Source list entries for this disc are:\n"
msgstr "該碟片的來源列表項目為:\n"
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
msgstr "卸載光碟機中..."
#: apt-pkg/indexcopy.cc:261