summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/acquire-item.cc13
-rw-r--r--apt-pkg/contrib/fileutl.cc20
-rw-r--r--apt-pkg/contrib/fileutl.h5
-rw-r--r--apt-pkg/contrib/strutl.cc5
-rw-r--r--apt-pkg/deb/dpkgpm.cc62
-rw-r--r--apt-pkg/init.cc1
-rw-r--r--apt-pkg/packagemanager.cc4
-rw-r--r--cmdline/apt-get.cc9
-rwxr-xr-xcmdline/apt-key44
-rw-r--r--configure.in2
-rw-r--r--debian/apt.auto-removal.sh93
-rw-r--r--debian/apt.conf.autoremove3
-rw-r--r--debian/apt.conf.changelog6
-rw-r--r--debian/apt.cron.daily12
-rw-r--r--debian/apt.dirs2
-rw-r--r--debian/changelog2792
-rw-r--r--debian/control9
-rwxr-xr-xdebian/rules7
-rw-r--r--doc/apt-key.8.xml10
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/examples/sources.list.in12
-rw-r--r--doc/makefile2
-rw-r--r--doc/po/apt-doc.pot16
-rw-r--r--doc/po/de.po30
-rw-r--r--doc/po/es.po30
-rw-r--r--doc/po/fr.po315
-rw-r--r--doc/po/it.po117
-rw-r--r--doc/po/ja.po30
-rw-r--r--doc/po/pl.po30
-rw-r--r--doc/po/pt.po30
-rw-r--r--doc/po/pt_BR.po14
-rw-r--r--ftparchive/override.cc4
-rw-r--r--po/apt-all.pot393
-rw-r--r--po/ar.po395
-rw-r--r--po/ast.po408
-rw-r--r--po/bg.po407
-rw-r--r--po/bs.po1480
-rw-r--r--po/ca.po430
-rw-r--r--po/cs.po409
-rw-r--r--po/cy.po399
-rw-r--r--po/da.po407
-rw-r--r--po/de.po410
-rw-r--r--po/dz.po399
-rw-r--r--po/el.po399
-rw-r--r--po/es.po470
-rw-r--r--po/eu.po422
-rw-r--r--po/fi.po434
-rw-r--r--po/fr.po411
-rw-r--r--po/gl.po431
-rw-r--r--po/he.po3579
-rw-r--r--po/hu.po416
-rw-r--r--po/it.po419
-rw-r--r--po/ja.po409
-rw-r--r--po/km.po399
-rw-r--r--po/ko.po407
-rw-r--r--po/ku.po395
-rw-r--r--po/lt.po399
-rw-r--r--po/mr.po399
-rw-r--r--po/nb.po406
-rw-r--r--po/ne.po399
-rw-r--r--po/nl.po409
-rw-r--r--po/nn.po399
-rw-r--r--po/pl.po408
-rw-r--r--po/pt.po411
-rw-r--r--po/pt_BR.po550
-rw-r--r--po/ro.po521
-rw-r--r--po/ru.po411
-rw-r--r--po/sk.po407
-rw-r--r--po/sl.po417
-rw-r--r--po/sv.po449
-rw-r--r--po/th.po407
-rw-r--r--po/tl.po399
-rw-r--r--po/uk.po408
-rw-r--r--po/vi.po408
-rw-r--r--po/zh_CN.po405
-rw-r--r--po/zh_TW.po466
-rwxr-xr-xprepare-release4
-rw-r--r--share/apt-auth-failure.note11
-rw-r--r--share/ubuntu-archive.gpgbin0 -> 1724 bytes
-rw-r--r--test/integration/exploid-keyring-with-dupe-keys.pubbin0 -> 3986 bytes
-rw-r--r--test/integration/exploid-keyring-with-dupe-subkeys.pubbin0 -> 2016 bytes
-rw-r--r--test/integration/framework20
-rwxr-xr-xtest/integration/skip-aptwebserver25
-rwxr-xr-xtest/integration/skip-bug-602412-dequote-redirect38
-rwxr-xr-xtest/integration/test-apt-key-net-update95
-rwxr-xr-xtest/integration/test-bug-602412-dequote-redirect30
-rwxr-xr-xtest/integration/test-bug-666772-multiarch-arch-all-build-deps118
-rwxr-xr-xtest/integration/test-kernel-helper-autoremove55
-rw-r--r--test/integration/test-kernel-helper-autoremove.fake-dpkg13
-rwxr-xr-xtest/integration/test-ubuntu-bug-346386-apt-get-update-paywall47
-rw-r--r--test/interactive-helper/aptwebserver.cc513
-rw-r--r--test/interactive-helper/makefile7
92 files changed, 16284 insertions, 11029 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 7b800e42f..a79dfb727 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1235,9 +1235,20 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,string Hash, /
}
else
{
+ // FIXME: move this into pkgAcqMetaClearSig::Done on the next
+ // ABI break
+
+ // if we expect a ClearTextSignature (InRelase), ensure that
+ // this is what we get and if not fail to queue a
+ // Release/Release.gpg, see #346386
+ if (SigFile == DestFile && !StartsWithGPGClearTextSignature(DestFile))
+ {
+ Failed(Message, Cfg);
+ return;
+ }
+
// There was a signature file, so pass it to gpgv for
// verification
-
if (_config->FindB("Debug::pkgAcquire::Auth", false))
std::cerr << "Metaindex acquired, queueing gpg verification ("
<< SigFile << "," << DestFile << ")\n";
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index f18e17005..c426293a3 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -852,6 +852,26 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap)
}
/*}}}*/
+// StartsWithGPGClearTextSignature - Check if a file is Pgp/GPG clearsigned /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool StartsWithGPGClearTextSignature(string const &FileName)
+{
+ static const char* SIGMSG = "-----BEGIN PGP SIGNED MESSAGE-----\n";
+ char buffer[strlen(SIGMSG)+1];
+ FILE* gpg = fopen(FileName.c_str(), "r");
+ if (gpg == NULL)
+ return false;
+
+ char const * const test = fgets(buffer, sizeof(buffer), gpg);
+ fclose(gpg);
+ if (test == NULL || strcmp(buffer, SIGMSG) != 0)
+ return false;
+
+ return true;
+}
+
+
// FileFd::Open - Open a file /*{{{*/
// ---------------------------------------------------------------------
/* The most commonly used open mode combinations are given with Mode */
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 426664d3a..510b1c984 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -180,6 +180,9 @@ bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
pid_t ExecFork();
bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
+// check if the given file starts with a PGP cleartext signature
+bool StartsWithGPGClearTextSignature(std::string const &FileName);
+
// File string manipulators
std::string flNotDir(std::string File);
std::string flNotFile(std::string File);
@@ -187,4 +190,6 @@ std::string flNoLink(std::string File);
std::string flExtension(std::string File);
std::string flCombine(std::string Dir,std::string File);
+
+
#endif
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 03b98e93e..64731b482 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -758,7 +758,8 @@ bool ReadMessages(int Fd, vector<string> &List)
// Look for the end of the message
for (char *I = Buffer; I + 1 < End; I++)
{
- if (I[0] != '\n' || I[1] != '\n')
+ if (I[1] != '\n' ||
+ (strncmp(I, "\n\n", 2) != 0 && strncmp(I, "\r\n\r\n", 4) != 0))
continue;
// Pull the message out
@@ -766,7 +767,7 @@ bool ReadMessages(int Fd, vector<string> &List)
PartialMessage += Message;
// Fix up the buffer
- for (; I < End && *I == '\n'; I++);
+ for (; I < End && (*I == '\r' || *I == '\n'); ++I);
End -= I-Buffer;
memmove(Buffer,I,End-Buffer);
I = Buffer;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 3bc31dc37..3dec4bb39 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -29,7 +29,6 @@
#include <sys/wait.h>
#include <signal.h>
#include <errno.h>
-#include <string.h>
#include <stdio.h>
#include <string.h>
#include <algorithm>
@@ -1465,7 +1464,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
string::size_type pos;
FILE *report;
- if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
+ if (_config->FindB("Dpkg::ApportFailureReport", true) == false)
{
std::clog << "configured to not write apport reports" << std::endl;
return;
@@ -1492,18 +1491,49 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
}
// do not report out-of-memory failures
- if(strstr(errormsg, strerror(ENOMEM)) != NULL) {
+ if(strstr(errormsg, strerror(ENOMEM)) != NULL ||
+ strstr(errormsg, "failed to allocate memory") != NULL) {
std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
return;
}
- // do not report dpkg I/O errors
- // XXX - this message is localized, but this only matches the English version. This is better than nothing.
- if(strstr(errormsg, "short read in buffer_copy (")) {
- std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
+ // do not report bugs regarding inaccessible local files
+ if(strstr(errormsg, strerror(ENOENT)) != NULL ||
+ strstr(errormsg, "cannot access archive") != NULL) {
+ std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
+ return;
+ }
+
+ // do not report errors encountered when decompressing packages
+ if(strstr(errormsg, "--fsys-tarfile returned error exit status 2") != NULL) {
+ std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
return;
}
+ // do not report dpkg I/O errors, this is a format string, so we compare
+ // the prefix and the suffix of the error with the dpkg error message
+ vector<string> io_errors;
+ io_errors.push_back(string("failed to read on buffer copy for %s"));
+ io_errors.push_back(string("failed in write on buffer copy for %s"));
+ io_errors.push_back(string("short read on buffer copy for %s"));
+
+ for (vector<string>::iterator I = io_errors.begin(); I != io_errors.end(); I++)
+ {
+ vector<string> list = VectorizeString(dgettext("dpkg", (*I).c_str()), '%');
+ if (list.size() > 1) {
+ // we need to split %s, VectorizeString only allows char so we need
+ // to kill the "s" manually
+ if (list[1].size() > 1) {
+ list[1].erase(0, 1);
+ if(strstr(errormsg, list[0].c_str()) &&
+ strstr(errormsg, list[1].c_str())) {
+ std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
+ return;
+ }
+ }
+ }
+ }
+
// get the pkgname and reportfile
pkgname = flNotDir(pkgpath);
pos = pkgname.find('_');
@@ -1593,6 +1623,24 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
char buf[1024];
while( fgets(buf, sizeof(buf), log) != NULL)
fprintf(report, " %s", buf);
+ fprintf(report, " \n");
+ fclose(log);
+ }
+ }
+
+ // attach history log it if we have it
+ string histfile_name = _config->FindFile("Dir::Log::History");
+ if (!histfile_name.empty())
+ {
+ FILE *log = NULL;
+ char buf[1024];
+
+ fprintf(report, "DpkgHistoryLog:\n");
+ log = fopen(histfile_name.c_str(),"r");
+ if(log != NULL)
+ {
+ while( fgets(buf, sizeof(buf), log) != NULL)
+ fprintf(report, " %s", buf);
fclose(log);
}
}
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 76278921f..4818174ac 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -92,6 +92,7 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.orig$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
// Default cdrom mount point
Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index e2d7dbf2a..9848ac1b0 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -338,7 +338,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
however if there is a loop (A depends on B, B depends on A) this will not
be the case, so check for dependencies before configuring. */
bool Bad = false, Changed = false;
- const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+ const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
unsigned int i=0;
do
{
@@ -603,7 +603,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured),
or by the ConfigureAll call at the end of the for loop in OrderInstall. */
bool Changed = false;
- const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500);
+ const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000);
unsigned int i = 0;
do
{
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 999f2a6a7..df24609b6 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2943,7 +2943,7 @@ bool DoBuildDep(CommandLine &CmdL)
for (; Ver != verlist.end(); ++Ver)
{
forbidden.clear();
- if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All)
+ if (Ver->MultiArch == pkgCache::Version::None)
{
if (colon == string::npos)
Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
@@ -2961,7 +2961,7 @@ bool DoBuildDep(CommandLine &CmdL)
else if (strcmp(D->Package.c_str() + colon, ":native") == 0)
Pkg = Ver.ParentPkg().Group().FindPkg("native");
}
- else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
+ else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::All)
{
if (colon == string::npos)
Pkg = Ver.ParentPkg().Group().FindPkg("native");
@@ -3252,7 +3252,10 @@ bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher,
return true;
// error
- return _error->Error("changelog download failed");
+ pkgRecords Recs(CacheFile);
+ pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList());
+ string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg();
+ return _error->Error("changelog for this version is not (yet) available; try https://launchpad.net/ubuntu/+source/%s/+changelog", srcpkg.c_str());
}
/*}}}*/
// DisplayFileInPager - Display File with pager /*{{{*/
diff --git a/cmdline/apt-key b/cmdline/apt-key
index c184e3e75..166508c8e 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -17,13 +17,13 @@ fi
GPG="$GPG_CMD"
-MASTER_KEYRING=""
-ARCHIVE_KEYRING_URI=""
-#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg
-#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
+# ubuntu keyrings
+MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg
+TMP_KEYRING=/var/lib/apt/keyrings/maybe-import-keyring.gpg
requires_root() {
if [ "$(id -u)" -ne 0 ]; then
@@ -35,7 +35,7 @@ requires_root() {
add_keys_with_verify_against_master_keyring() {
ADD_KEYRING=$1
MASTER=$2
-
+
if [ ! -f "$ADD_KEYRING" ]; then
echo "ERROR: '$ADD_KEYRING' not found"
return
@@ -50,12 +50,28 @@ add_keys_with_verify_against_master_keyring() {
# all keys that are exported must have a valid signature
# from a key in the $distro-master-keyring
add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5`
+ all_add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^[ps]ub | cut -d: -f5`
master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5`
+
+ # ensure there are no colisions LP: #857472
+ for all_add_key in $all_add_keys; do
+ for master_key in $master_keys; do
+ if [ "$all_add_key" = "$master_key" ]; then
+ echo >&2 "Keyid collision for '$all_add_key' detected, operation aborted"
+ return 1
+ fi
+ done
+ done
+
for add_key in $add_keys; do
- ADDED=0
+ # export the add keyring one-by-one
+ rm -f $TMP_KEYRING
+ $GPG_CMD --keyring $ADD_KEYRING --output $TMP_KEYRING --export $add_key
+ # check if signed with the master key and only add in this case
+ ADDED=0
for master_key in $master_keys; do
- if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then
- $GPG_CMD --quiet --batch --keyring $ADD_KEYRING --export $add_key | $GPG --import
+ if $GPG_CMD --keyring $MASTER --keyring $TMP_KEYRING --check-sigs --with-colons $add_key | grep '^sig:!:' | cut -d: -f5 | grep -q $master_key; then
+ $GPG --import $TMP_KEYRING
ADDED=1
fi
done
@@ -63,12 +79,16 @@ add_keys_with_verify_against_master_keyring() {
echo >&2 "Key '$add_key' not added. It is not signed with a master key"
fi
done
+ rm -f $TMP_KEYRING
}
# update the current archive signing keyring from a network URI
# the archive-keyring keys needs to be signed with the master key
# (otherwise it does not make sense from a security POV)
net_update() {
+ # Disabled for now as code is insecure (LP: #1013639 (and 857472, 1013128))
+ exit 1
+
if [ -z "$ARCHIVE_KEYRING_URI" ]; then
echo >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set"
exit 1
@@ -88,7 +108,7 @@ net_update() {
if [ -e $keyring ]; then
old_mtime=$(stat -c %Y $keyring)
fi
- (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI)
+ (cd /var/lib/apt/keyrings; wget --timeout=90 -q -N $ARCHIVE_KEYRING_URI)
if [ ! -e $keyring ]; then
return
fi
@@ -102,7 +122,7 @@ net_update() {
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-archive-keyring package installed?"
+ echo >&2 "Is the ubuntu-keyring package installed?"
exit 1
fi
requires_root
diff --git a/configure.in b/configure.in
index 91a157c33..44334e3e9 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)
PACKAGE="apt"
-PACKAGE_VERSION="0.9.7.9~exp3"
+PACKAGE_VERSION="0.9.7.9~exp3ubuntu1"
PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh
new file mode 100644
index 000000000..4ada56556
--- /dev/null
+++ b/debian/apt.auto-removal.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+set -e
+
+# Author: Steve Langasek <steve.langasek@canonical.com>
+#
+# Mark as not-for-autoremoval those kernel packages that are:
+# - the currently booted version
+# - the kernel version we've been called for
+# - the latest kernel version (determined using rules copied from the grub
+# package for deciding which kernel to boot)
+# - the second-latest kernel version, if the booted kernel version is
+# already the latest and this script is called for that same version,
+# to ensure a fallback remains available in the event the newly-installed
+# kernel at this ABI fails to boot
+# In the common case, this results in exactly two kernels saved, but it can
+# result in three kernels being saved. It's better to err on the side of
+# saving too many kernels than saving too few.
+#
+# We generate this list and save it to /etc/apt/apt.conf.d instead of marking
+# packages in the database because this runs from a postinst script, and apt
+# will overwrite the db when it exits.
+
+
+eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d)
+test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d"
+config_file=${APT_CONF_D}/01autoremove-kernels
+
+eval $(apt-config shell DPKG Dir::bin::dpkg/f)
+test -n "$DPKG" || DPKG="/usr/bin/dpkg"
+
+installed_version="$1"
+running_version="$(uname -r)"
+
+
+version_test_gt ()
+{
+ local version_test_gt_sedexp="s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g"
+ local version_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`"
+ local version_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`"
+ $DPKG --compare-versions "$version_a" gt "$version_b"
+ return "$?"
+}
+
+list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//')
+
+latest_version=""
+previous_version=""
+for i in $list; do
+ if version_test_gt "$i" "$latest_version"; then
+ previous_version="$latest_version"
+ latest_version="$i"
+ elif version_test_gt "$i" "$previous_version"; then
+ previous_version="$i"
+ fi
+done
+
+if [ "$latest_version" != "$installed_version" ] \
+ || [ "$latest_version" != "$running_version" ] \
+ || [ "$installed_version" != "$running_version" ]
+then
+ # We have at least two kernels that we have reason to think the
+ # user wants, so don't save the second-newest version.
+ previous_version=
+fi
+
+kernels=$(sort -u <<EOF
+$latest_version
+$installed_version
+$running_version
+$previous_version
+EOF
+)
+
+cat > "$config_file".dpkg-new <<EOF
+// File autogenerated by $0, do not edit
+APT
+{
+ NeverAutoRemove
+ {
+EOF
+for kernel in $kernels; do
+ echo " \"^linux-image-${kernel}$\";" >> "$config_file".dpkg-new
+ echo " \"^linux-image-extra-${kernel}$\";" >> "$config_file".dpkg-new
+ echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new
+ echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new
+ echo " \"^linux-headers-${kernel}$\";" >> "$config_file".dpkg-new
+done
+cat >> "$config_file".dpkg-new <<EOF
+ };
+};
+EOF
+mv "$config_file".dpkg-new "$config_file"
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index c7ad51e66..9684c9c7d 100644
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -4,10 +4,7 @@ APT
{
"^firmware-linux.*";
"^linux-firmware$";
- "^linux-image.*";
"^kfreebsd-image.*";
- "^linux-restricted-modules.*";
- "^linux-ubuntu-modules-.*";
"^gnumach$";
"^gnumach-image.*";
};
diff --git a/debian/apt.conf.changelog b/debian/apt.conf.changelog
new file mode 100644
index 000000000..c4092ff44
--- /dev/null
+++ b/debian/apt.conf.changelog
@@ -0,0 +1,6 @@
+// Server information for apt-changelog
+APT {
+ Changelogs {
+ Server "http://changelogs.ubuntu.com/changelogs";
+ };
+};
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 2665b6579..27560fe85 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -436,6 +436,13 @@ fi
UPDATED=0
UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
if check_stamp $UPDATE_STAMP $UpdateInterval; then
+ # check for a new archive signing key (against the master keyring)
+ if eval apt-key net-update $XSTDERR; then
+ debug_echo "apt-key net-update (success)"
+ else
+ debug_echo "apt-key net-update (failure)"
+ fi
+ # run apt-get update
if eval apt-get $XAPTOPT -y update $XSTDERR; then
debug_echo "download updated metadata (success)."
if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then
@@ -449,6 +456,11 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then
fi
update_stamp $UPDATE_STAMP
UPDATED=1
+ # now run apt-xapian-index if it is installed to ensure the index
+ # is up-to-date
+ if [ -x /usr/sbin/update-apt-xapian-index ]; then
+ nice ionice -c3 update-apt-xapian-index -q -u
+ fi
else
debug_echo "download updated metadata (error)"
fi
diff --git a/debian/apt.dirs b/debian/apt.dirs
index f9c0b6c3e..ecbcdbc0a 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -7,10 +7,12 @@ etc/apt/apt.conf.d
etc/apt/preferences.d
etc/apt/sources.list.d
etc/apt/trusted.gpg.d
+etc/kernel/postinst.d
etc/logrotate.d
var/cache/apt/archives/partial
var/lib/apt/lists/partial
var/lib/apt/mirrors/partial
var/lib/apt/periodic
var/log/apt
+usr/share/apt
usr/share/bug/apt
diff --git a/debian/changelog b/debian/changelog
index 7944d76ef..1194658c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (0.9.7.9~exp3ubuntu1) UNRELEASEDsaucy; urgency=low
+
+ * merged from debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 30 Apr 2013 10:28:43 +0200
+
apt (0.9.7.9~exp3) experimental; urgency=low
[ Michael Vogt ]
@@ -185,6 +191,50 @@ apt (0.9.7.8~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 01 Mar 2013 14:16:42 +0100
+apt (0.9.7.7ubuntu4) raring; urgency=low
+
+ [ Michael Vogt ]
+ * test/integration/test-bug-1078697-missing-source-hashes:
+ - add test for deb-src hash generation
+
+ [ Marc Deslauriers ]
+ * make apt-ftparchive generate missing deb-src hashes (LP: #1078697)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Apr 2013 14:52:15 +0200
+
+apt (0.9.7.7ubuntu3) raring; urgency=low
+
+ * SECURITY UPDATE: InRelease verification bypass
+ - CVE-2013-1051
+
+ [ David Kalnischk ]
+ * apt-pkg/deb/debmetaindex.cc,
+ test/integration/test-bug-595691-empty-and-broken-archive-files,
+ test/integration/test-releasefile-verification:
+ - disable InRelease downloading until the verification issue is
+ fixed, thanks to Ansgar Burchardt for finding the flaw
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Mar 2013 14:25:56 +0100
+
+apt (0.9.7.7ubuntu2) raring; urgency=low
+
+ * Cherry-pick from David's sid branch to fix a multiarch library
+ installation problem:
+
+ [ David Kalnischkies ]
+ * apt-pkg/depcache.cc:
+ - prefer to install packages which have an already installed M-A:same
+ sibling while choosing providers (LP: #1130419)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 Mar 2013 17:55:03 -0800
+
+apt (0.9.7.7ubuntu1) raring; urgency=low
+
+ * Merge from Debian unstable, pulling in new translations and fixes.
+ * Add linux-headers to /etc/kernel/postinst.d/apt-auto-removal guard.
+
+ -- Adam Conrad <adconrad@ubuntu.com> Fri, 18 Jan 2013 00:32:14 -0700
+
apt (0.9.7.7) unstable; urgency=low
[ Program translation updates ]
@@ -220,6 +270,81 @@ apt (0.9.7.7) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 13 Dec 2012 09:52:19 +0100
+apt (0.9.7.6ubuntu6) raring; urgency=low
+
+ * merged from the debian-sid branch
+
+ [ Program translation updates ]
+ * Catalan (Jordi Mallach)
+ * Drop a confusing non-breaking space. Closes: #691024
+ * Thai (Theppitak Karoonboonyanan). Closes: #691613
+ * Vietnamese (Trần Ngọc Quân). Closes: #693773
+ * Fix Plural forms in German, French, Japanese and Portuguese
+ translations. Thanks to Jakub Wilk for reporting these errors.
+
+ [ Michael Vogt ]
+ * change permissions of /var/log/apt/term.log to 0640 (LP: #975199)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2012 09:14:54 +0100
+
+apt (0.9.7.6ubuntu5) raring; urgency=low
+
+ * Revert build-dependency from gettext:any to gettext, now that gettext is
+ Multi-Arch: foreign.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Thu, 29 Nov 2012 15:43:21 +0000
+
+apt (0.9.7.6ubuntu4) raring; urgency=low
+
+ * Fix mismerge of cross-build-dependency handling patch from
+ 0.8.16~exp12ubuntu7.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 20 Nov 2012 18:16:36 +0000
+
+apt (0.9.7.6ubuntu3) raring; urgency=low
+
+ * Fix comment char in /etc/apt/apt.conf.d/01autoremove-kernels to
+ use C++ style comments instead of POSIX shell style (LP: #1076237)
+
+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 07 Nov 2012 23:10:35 -0700
+
+apt (0.9.7.6ubuntu2) raring; urgency=low
+
+ * Fix up two things in debian/apt.auto-removal.sh:
+ - Use exact matches with $-terminated regexes, so we don't get
+ confusion between similarly-named kernel flavours.
+ - Keep linux-backports-modules in sync with installed kernels.
+
+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 06 Nov 2012 15:54:31 -0700
+
+apt (0.9.7.6ubuntu1) raring; urgency=low
+
+ [ Michael Vogt ]
+ * merged from debian-sid
+
+ [ Program translation updates ]
+ * Catalan (Jordi Mallach)
+ * Drop a confusing non-breaking space. Closes: #691024
+ * Thai (Theppitak Karoonboonyanan). Closes: #691613
+
+ [ David Kalnischkies ]
+ * apt-pkg/packagemanager.cc:
+ - do not do lock-step configuration for a M-A:same package if it isn't
+ unpacked yet in SmartConfigure and do not unpack a M-A:same package
+ again in SmartUnPack if we have already configured it (LP: #1062503)
+
+ [ Steve Langasek ]
+ * debian/apt.conf.autoremove: don't include linux-image*,
+ linux-restricted-modules*, and linux-ubuntu-modules* packages in the
+ list to never be autoremoved.
+ * debian/apt.auto-removal.sh, debian/rules, debian/apt.dirs: install new
+ script to /etc/kernel/postinst.d/ which ensures we only automatically
+ keep the currently-running kernel, the being-installed kernel, and the
+ newest kernel, so we don't fill /boot up with an unlimited number of
+ kernels. LP: #923876.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 06 Nov 2012 15:12:36 +0100
+
apt (0.9.7.6) unstable; urgency=low
[ Program translation updates ]
@@ -258,6 +383,93 @@ apt (0.9.7.6) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 16 Oct 2012 18:08:53 +0200
+apt (0.9.7.5ubuntu5) quantal; urgency=low
+
+ * Revert "missing remap registration" change from 0.9.7.5ubuntu4; this
+ iterator was already registered, and double registration causes a crash
+ (LP: #1067056).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 16 Oct 2012 11:35:59 +0100
+
+apt (0.9.7.5ubuntu4) quantal-proposed; urgency=low
+
+ [ Colin Watson ]
+ * apt-pkg/pkgcachegen.cc:
+ - Fix crash if the cache is remapped while writing a Provides version
+ (LP: #1066445).
+
+ Cherry-pick from http://bzr.debian.org/bzr/apt/apt/debian-sid:
+
+ [ David Kalnischkies ]
+ * apt-pkg/pkgcachegen.cc:
+ - add a missing remap registration causing a segfault in case
+ we use the not remapped iterators after a move of the mmap again
+
+ -- Colin Watson <cjwatson@ubuntu.com> Sun, 14 Oct 2012 23:54:27 +0100
+
+apt (0.9.7.5ubuntu3) quantal-proposed; urgency=low
+
+ * Refresh translations from Launchpad. Amongst other fixes, this drops the
+ erroneous "个" from "Retrieving file ..." translation in zn_CN.
+ (LP: #985634)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 12 Oct 2012 13:01:30 +0200
+
+apt (0.9.7.5ubuntu2) quantal; urgency=low
+
+ Merged from lp:~donkult/apt/experimental:
+
+ [ David Kalnischkies ]
+ * apt-pkg/contrib/strutl.cc:
+ - support \n and \r\n line endings in ReadMessages
+
+ [ Michael Vogt ]
+ * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
+ - merge fix for LP: #346386
+
+
+ Merged from http://bzr.debian.org/bzr/apt/apt/debian-sid:
+
+ [ David Kalnischkies ]
+ * apt-pkg/cdrom.cc:
+ - copy only configured translation files from a CD-ROM and not all
+ available translation files preventing new installs with d-i from
+ being initialized with all translations (Closes: #678227)
+ - handle Components in the reduction for the source.list as multi-arch CDs
+ otherwise create duplicated source entries (e.g. "wheezy main main")
+ * apt-pkg/packagemanager.cc:
+ - unpack versions only in case a different version from the package
+ is currently in unpack state to recover from broken system states
+ (like different file in M-A:same package and other dpkg errors)
+ and avoid re-unpack otherwise (Closes: #670900)
+ * debian/control:
+ - let libapt-pkg break apt < 0.9.4 to ensure that the installed http-
+ method supports the new redirection-style, thanks to Raphael Geissert
+ for reporting & testing (Closes: #685192)
+ * doc/apt_preferences.5.xml:
+ - use the correct interval (x <= P < y) for pin value documentation as
+ these are the intervals used by the code (Closes: #685989)
+ * apt-pkg/indexcopy.cc:
+ - do not create duplicated flat-archive CD-ROM sources for foreign
+ architectures on multi-arch CD-ROMs
+ - do not warn about files which have a record in the Release file, but
+ are not present on the CD to mirror the behavior of the other methods
+ and to allow uncompressed indexes to be dropped without scaring users
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 04 Sep 2012 15:42:09 +0200
+
+apt (0.9.7.5ubuntu1) quantal; urgency=low
+
+ [ Michael Vogt ]
+ * merged latest fixes from the debian-sid branch
+
+ [ TJ ]
+ * apt-pkg/contrib/netrc.cc:
+ - increase LOGINSIZE/PASSWORDSIZE limits and add proper error
+ if the limits are reached (LP: #1008289)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Aug 2012 12:06:48 +0200
+
apt (0.9.7.5) unstable; urgency=low
[ Manpages translation updates ]
@@ -401,6 +613,19 @@ apt (0.9.7.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 13 Jul 2012 21:33:56 +0200
+apt (0.9.7.1ubuntu2) quantal; urgency=low
+
+ * ftparchive/override.cc:
+ - Double maximum override line length to 1000 (LP: #1038961).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Mon, 20 Aug 2012 12:04:30 +0100
+
+apt (0.9.7.1ubuntu1) quantal; urgency=low
+
+ * merged from the debian-sid branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jun 2012 15:33:42 +0200
+
apt (0.9.7.1) unstable; urgency=low
[ Program translation updates ]
@@ -459,6 +684,44 @@ apt (0.9.7) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 19 Jun 2012 16:42:43 +0200
+apt (0.9.6ubuntu3) quantal; urgency=low
+
+ * SECURITY UPDATE: Disable apt-key net-update for now, as validation
+ code is still insecure
+ - cmdline/apt-key: exit 1 immediately in net_update()
+ - CVE-2012-0954
+ - LP: #1013639
+
+ -- Jamie Strandboge <jamie@ubuntu.com> Fri, 15 Jun 2012 08:03:17 -0500
+
+apt (0.9.6ubuntu2) quantal; urgency=low
+
+ * adjust apt-key to ensure no collisions on subkeys too. Patch thanks to
+ Marc Deslauriers. (LP: #1013128)
+
+ -- Jamie Strandboge <jamie@ubuntu.com> Thu, 14 Jun 2012 11:29:48 -0500
+
+apt (0.9.6ubuntu1) quantal; urgency=low
+
+ [ Michael Vogt ]
+ * merged from Debian, remaining changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+ - APT::pkgPackageManager::MaxLoopCount set to 5000
+ - apport pkgfailure handling
+ - ubuntu changelog download handling
+ - patch for apt cross-building, see http://bugs.debian.org/666772
+
+ [ Steve Langasek ]
+ * Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu,
+ removed in previous LTS.
+ * prepare-release: declare the packages needed as source build deps.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Jun 2012 22:36:16 +0000
+
apt (0.9.6) unstable; urgency=low
[ David Kalnischkies ]
@@ -969,6 +1232,152 @@ apt (0.8.16~exp13) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 06 Mar 2012 18:12:57 +0100
+apt (0.8.16~exp12ubuntu10) precise-proposed; urgency=low
+
+ [ Malcolm Scott ]
+ * apt-pkg/packagemanager.cc:
+ - Fix a regression in the pre-depend handling: where a pre-depend option
+ other than the first specified is already installed, apt-get enters an
+ infinite loop (LP: #985852)
+
+ [ Michael Vogt ]
+ * apt-pkg/packagemanager.cc:
+ - add APT::pkgPackageManager::MaxLoopCount to ensure that the
+ ordering code does not get into a endless loop when it flip-flops
+ between two states
+
+ [ David Kalnischkies ]
+ * apt-pkg/cacheset.cc:
+ - actually return to the fallback modifier if we have detected we
+ should for packagenames which look like modifiers (Closes: #669591)
+ LP: #982716
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 20 Apr 2012 11:10:12 +0200
+
+apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low
+
+ * apt-inst/contrib/extracttar.cc:
+ - ensure that in StartGzip the InFd is set to "AutoClose" to ensure
+ that the pipe is closed when InFd is closed. This fixes a Fd leak
+ (LP: #985452)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Apr 2012 11:38:43 +0200
+
+apt (0.8.16~exp12ubuntu8) precise; urgency=low
+
+ * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010)
+
+ -- Adam Conrad <adconrad@ubuntu.com> Thu, 12 Apr 2012 16:26:20 -0600
+
+apt (0.8.16~exp12ubuntu7) precise; urgency=low
+
+ * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
+ dropped in maverick.
+ * Build-depend on gettext:any for cross-building support.
+ * Don't treat build-depends-indep as cross-build-dependencies; we should
+ always install the host arch versions. LP: #968828.
+ * Makefile, po/makefile: make sure our pot generation datestamp doesn't
+ change at build time, since this makes translations fail to be
+ co-installable with multiarch. Based on a patch by David Kalnischkies.
+ Closes: #659333, LP: #924628.
+ * For cross-build-dependencies, Architecture: all packages should be
+ treated as implicitly Multi-Arch: foreign, because either they *are*
+ M-A: foreign when used as a build-dependency, or they need to be updated
+ to not be Architecture: all; and since cross-build-deps are new
+ functionality in apt, we can safely make this change without breaking
+ existing systems. Closes: #666772.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 05 Apr 2012 18:00:23 -0700
+
+apt (0.8.16~exp12ubuntu6) precise; urgency=low
+
+ * cherry pick from
+ http://bzr.debian.org/bzr/bzr/apt/apt/debian-experimental2/:
+ * apt-pkg/packagemanager.cc:
+ - fix bug in predepends handling - ensure that packages that needs
+ unpackaging are unpacked before they are configured (LP: #927993)
+ * apt-pkg/packagemanager.cc:
+ - do not try to a void a breaks if the broken package pre-depends
+ on the breaker, but let dpkg auto-deconfigure it
+ * apt-pkg/packagemanager.cc:
+ - recheck all dependencies if we changed a package in SmartConfigure
+ as this could break an earlier dependency (LP: #940396)
+ * recheck dependencies in SmartUnpack after a change, too
+ * add Debug::pkgAcqArchive::NoQueue to disable package downloading
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Mar 2012 19:46:08 +0100
+
+apt (0.8.16~exp12ubuntu5) precise; urgency=low
+
+ [ Michael Vogt ]
+ * merged from the debian-sid branch, most notably:
+ - Correct fi translation for hash sum mismatches (LP: #420403)
+ Thanks to Jani Uusitalo
+ - remove 'old' InRelease file if we can't get a new one before
+ proceeding with Release.gpg to avoid the false impression of a still
+ trusted repository by a (still present) old InRelease file.
+ Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 06 Mar 2012 17:52:50 +0100
+
+apt (0.8.16~exp12ubuntu4) precise; urgency=low
+
+ * apt-pkg/contrib/fileutl.h:
+ - fix compatibility with FileFd::OpenDescriptor() in ReadOnlyGzip mode
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 14 Feb 2012 10:06:28 +0100
+
+apt (0.8.16~exp12ubuntu3) precise; urgency=low
+
+ * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
+ handle compressed files again (LP: #924182).
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 31 Jan 2012 11:19:46 +0000
+
+apt (0.8.16~exp12ubuntu2) precise; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - chroot if needed before dpkg --assert-multi-arch
+ - ensure that dpkg binary doesn't have the chroot-directory prefixed
+ * apt-pkg/depcache.cc:
+ - if a M-A:same package is marked for reinstall, mark all it's installed
+ silbings for reinstallation as well (LP: #859188)
+ * apt-pkg/contrib/configuration.cc:
+ - do not stop parent transversal in FindDir if the value is empty
+ * methods/http{s,}.cc:
+ - if a file without an extension is requested send an 'Accept: text/*'
+ header to avoid that the server chooses unsupported compressed files
+ in a content-negotation attempt (Closes: #657560)
+ * apt-pkg/aptconfiguration.cc:
+ - chroot if needed before calling dpkg --print-foreign-architectures
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix crash when a package is in removed but residual config state
+ (LP: #923807)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Jan 2012 21:03:12 +0100
+
+apt (0.8.16~exp12ubuntu1) precise; urgency=low
+
+ [ Michael Vogt ]
+ * merge from debian/experimental:
+ - new ABI
+
+ [ Steve Langasek ]
+ * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that
+ we resolve virtual package Breaks more effectively. Thanks to Colin
+ Watson for the patch. Closes: #657695, LP: #922485.
+ * apt-pkg/algorithms.{cc,h}: use an int to represent resolver scores, not
+ a signed short, because large upgrades can result in an overflow for
+ core packages. Thanks again to Colin Watson. Closes: #657732,
+ LP: #917173.
+ * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.
+ Closes: #646288.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 29 Jan 2012 00:44:16 +0000
+
apt (0.8.16~exp12) experimental; urgency=low
[ Michael Vogt ]
@@ -1161,6 +1570,189 @@ apt (0.8.16~exp6) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 14 Sep 2011 21:06:51 +0200
+apt (0.8.16~exp5ubuntu14.2.1) UNRELEASED; urgency=low
+
+ [ Daniel Hahler ]
+ * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 20 Oct 2011 10:58:20 +0200
+
+apt (0.8.16~exp5ubuntu14.2) precise; urgency=low
+
+ * Call update-apt-xapian-index with -u on all arches in
+ cron.daily to make it behave slightly more pleasantly.
+
+ -- Adam Conrad <adconrad@ubuntu.com> Mon, 09 Jan 2012 07:41:03 -0700
+
+apt (0.8.16~exp5ubuntu14.1) precise; urgency=low
+
+ * apt-pkg/edsp.cc:
+ - fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 19 Oct 2011 17:56:49 +0200
+
+apt (0.8.16~exp5ubuntu14) precise; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/pkgcachegen.cc:
+ - refactor MergeList by creating -Group, -Package and -Version specialist
+ - share description list between "same" versions (LP: #868977)
+ This also means that descriptions are shared across archives now.
+ * apt-pkg/pkgcache.cc:
+ - always prefer "en" over "" for "en"-language regardless of cache-order
+ (LP: #868977)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 19 Oct 2011 16:22:31 +0200
+
+apt (0.8.16~exp5ubuntu13) oneiric; urgency=low
+
+ [ Adam Conrad ]
+ * On armel, call update-apt-xapian-index with '-u' to keep the CPU
+ and I/O usage low. We would do this on all arches, but there's a
+ regression risk here, but that's better than killing slow systems.
+
+ [ Michael Vogt ]
+ * cmdline/apt-key:
+ - fix apt-key net-update, thanks to Marc Deslauriers and
+ Adam Conrad for the code review (LP: #857472)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 06 Oct 2011 16:14:41 +0200
+
+apt (0.8.16~exp5ubuntu12) oneiric; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/deb/deblistparser.cc:
+ - fix crash when the dynamic mmap needs to be remapped during
+ LoadReleaseInfo (LP: #854090)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Sep 2011 13:31:11 +0200
+
+apt (0.8.16~exp5ubuntu11) oneiric; urgency=low
+
+ [ Colin Watson ]
+ * ftparchive/cachedb.cc:
+ - fix buffersize in bytes2hex
+
+ [ Marc Deslauriers ]
+ * SECURITY UPDATE: Disable apt-key net-update for now, as validation
+ code is insecure.
+ - cmdline/apt-key: exit immediately out of net_update().
+ - CVE number pending
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 22 Sep 2011 17:30:45 +0200
+
+apt (0.8.16~exp5ubuntu10) oneiric; urgency=low
+
+ * methods/https.cc:
+ - cleanup broken downloads properly (just like http)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 20 Sep 2011 18:26:13 +0200
+
+apt (0.8.16~exp5ubuntu9) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
+ - fix fetching translated package descriptions (including the newly
+ stripped out english ones) by adding OptionalSubIndexTarget
+
+ [ David Kalnischkies ]
+ * apt-pkg/acquire-item.cc:
+ - if no Release.gpg file is found try to verify with hashes,
+ but do not fail if a hash can't be found
+ * apt-pkg/indexrecords.cc:
+ - fix Acquire::Max-ValidTime option by interpreting it really
+ as seconds as specified in the manpage and not as days
+ - add an Acquire::Min-ValidTime option (Closes: #640122)
+ * doc/apt.conf.5.xml:
+ - reword Acquire::Max-ValidTime documentation to make clear
+ that it doesn't provide the new Min-ValidTime functionality
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 16 Sep 2011 09:50:16 +0200
+
+apt (0.8.16~exp5ubuntu8) oneiric; urgency=low
+
+ * cherry pick r1825 from lp:~mvo/apt/mvo:
+ * apt-pkg/contrib/configuration.cc:
+ - fix double delete (LP: #848907)
+ - ignore only the invalid regexp instead of all options
+
+ * cherry pick r2165 from lp:~donkult/apt/sid:
+ [ David Kalnischkies ]
+ * cmdline/apt-get.cc:
+ - output list of virtual package providers to c1out in -q=1
+ instead of /dev/null to unbreak sbuild (LP: #816155)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2011 18:23:09 +0200
+
+apt (0.8.16~exp5ubuntu7) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * cherry pick revision 2173 from lp:~donkult/apt/sid
+
+ [ David Kalnischkies ]
+ - M-A:same lockstep unpack should operate on installed
+ packages first (LP: #835625)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2011 09:03:33 +0200
+
+apt (0.8.16~exp5ubuntu6) oneiric; urgency=low
+
+ [ Michael Vogt
+ * merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to
+ Jonathan Riddell
+
+ [ David Kalnischkies ]
+ * lots of cppcheck fixes
+ * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc:
+ - ignore "self"-conflicts for all architectures of a package
+ instead of just for the architecture of the package locked at
+ in the ordering of installations too (Closes: #802901)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Aug 2011 11:32:58 +0200
+
+apt (0.8.16~exp5ubuntu5) oneiric; urgency=low
+
+ * debian/control:
+ - fix VCS location
+ * methods/mirror.cc:
+ - include the architecture(s) in the query string as well so
+ that the server can make better decisions
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 11 Aug 2011 18:03:19 +0200
+
+apt (0.8.16~exp5ubuntu4) oneiric; urgency=low
+
+ * Merge change from Robert Collins to upgrade ubuntu-keyring recommends
+ to a hard dependency to match Debian behaviour and fix LP: #816606
+
+ -- Adam Conrad <adconrad@ubuntu.com> Tue, 09 Aug 2011 14:48:24 -0600
+
+apt (0.8.16~exp5ubuntu3) oneiric; urgency=low
+
+ * apt-pkg/acquire.cc:
+ - fix potential divide-by-zero (LP: #823277)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Aug 2011 15:56:44 +0200
+
+apt (0.8.16~exp5ubuntu2) oneiric; urgency=low
+
+ * test/integration/test-hashsum-verification:
+ - add regression test for hashsum verification
+ * apt-pkg/acquire-item.cc:
+ - if no Release.gpg file is found, still load the hashes for
+ verification (closes: #636314) and add test
+ * apt-pkg/pkgcachegen.cc:
+ - fix incorrect comparision when checking sources.list freshness
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Aug 2011 09:22:14 +0200
+
+apt (0.8.16~exp5ubuntu1) oneiric; urgency=low
+
+ * merged new version from debian/experimental, this includes
+ a ABI break and two new library packages
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 08 Aug 2011 14:30:07 +0200
+
apt (0.8.16~exp5) experimental; urgency=low
* merged the latest debian-sid fixes
@@ -1447,6 +2039,14 @@ apt (0.8.15.6) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 15 Aug 2011 09:20:35 +0200
+apt (0.8.15.5ubuntu1) oneiric; urgency=low
+
+ * apt-pkg/pkgcachegen.{cc,h}:
+ - fix crash when P.Arch() was used but the cache got remapped
+ (LP: #812862)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 01 Aug 2011 15:18:50 +0200
+
apt (0.8.15.5) unstable; urgency=low
[ David Kalnischkies ]
@@ -1455,6 +2055,28 @@ apt (0.8.15.5) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 28 Jul 2011 16:49:15 +0200
+apt (0.8.15.4ubuntu2) oneiric; urgency=low
+
+ * apt-pkg/contrib/fileutl.{cc,h}:
+ - add GetModificationTime() helper
+ * apt-pkg/pkgcachegen.cc:
+ - regenerate the cache if the sources.list changes to ensure
+ that changes in the ordering there will be honored by apt
+ * apt-pkg/sourcelist.{cc,h}:
+ - add pkgSourceList::GetLastModifiedTime() helper
+ * apt-pkg/pkgcachegen.{cc,h}:
+ - use ref-to-ptr semantic in NewDepends() to ensure that the
+ libapt does not segfault if the cache is remapped in between
+ (LP: #812862)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Jul 2011 18:25:22 +0200
+
+apt (0.8.15.4ubuntu1) oneiric; urgency=low
+
+ * merged from debian-sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Jul 2011 13:19:49 +0200
+
apt (0.8.15.4) unstable; urgency=low
[ David Miller ]
@@ -1519,6 +2141,39 @@ apt (0.8.15.3) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 25 Jul 2011 15:04:43 +0200
+apt (0.8.15.2ubuntu2) oneiric; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix missing download progress in apt-get download
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 22 Jul 2011 13:20:49 +0200
+
+apt (0.8.15.2ubuntu1) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire-item.cc:
+ - improve error message for a expired Release file
+ * apt-pkg/algorithms.cc:
+ - Hold back packages that would enter "policy-broken" state on upgrade
+ when doing a "apt-get upgrade"
+
+ [ David Kalnischkies ]
+ * apt-pkg/pkgcachegen.cc:
+ - fallback to memory if file is not writeable even if access()
+ told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
+ * doc/sources.list.5.xml:
+ - document available [options] for sources.list entries (Closes: 632441)
+ * doc/apt.conf.5.xml:
+ - document APT::Architectures list (Closes: #612102)
+ * cmdline/apt-get.cc:
+ - restore all important dependencies for garbage packages (LP: #806274)
+ * apt-pkg/init.cc:
+ - use CndSet in pkgInitConfig (Closes: #629617)
+ * apt-pkg/depcache.cc:
+ - change default of APT::AutoRemove::SuggestsImportant to true
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 15 Jul 2011 10:16:45 +0200
+
apt (0.8.15.2) unstable; urgency=high
* fix from David Kalnischkies for the InRelease gpg verification
@@ -1526,6 +2181,24 @@ apt (0.8.15.2) unstable; urgency=high
-- Michael Vogt <mvo@debian.org> Tue, 12 Jul 2011 11:54:47 +0200
+apt (0.8.15.1ubuntu2) oneiric; urgency=low
+
+ [ Brian Murray ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - do not report errors encountered when decompressing packages
+
+ [ Michael Vogt ]
+ * fix from David Kalnischkies for the InRelease gpg verification
+ code (LP: #784473)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Jul 2011 14:42:02 +0200
+
+apt (0.8.15.1ubuntu1) oneiric; urgency=low
+
+ * merge from debian/sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 30 Jun 2011 09:16:12 +0100
+
apt (0.8.15.1) unstable; urgency=low
[ David Kalnischkies ]
@@ -1549,6 +2222,17 @@ apt (0.8.15.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 30 Jun 2011 10:05:36 +0200
+apt (0.8.15ubuntu1) oneiric; urgency=low
+
+ * merged from debian-unstable, remainging changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 29 Jun 2011 09:03:39 +0100
+
apt (0.8.15) unstable; urgency=low
[ Julian Andres Klode ]
@@ -1837,6 +2521,101 @@ apt (0.8.14.2) UNRELEASED; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 16 May 2011 14:57:52 +0200
+apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.conf.changelog:
+ - add missing ";", thanks to Julian Andres Klode
+
+ [ Brian Murray ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - updated allocate memory string
+ - cannot access archive string is lowercase
+ * apt-pkg/deb/dpkgpm.cc:
+ - resolve issue where AptOrdering is included in DpkgTerminalLog in apport
+ attachments
+
+ -- Brian Murray <brian@ubuntu.com> Wed, 15 Jun 2011 14:00:43 -0700
+
+apt (0.8.14.1ubuntu7) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/deblistparser.cc:
+ - include all known languages when building the apt cache
+ (LP: #794907)
+ * apt-pkg/deb/debindexfile.cc:
+ - remove some no longer valid checks for "TranslationsAvailable()"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Jun 2011 13:56:25 +0200
+
+apt (0.8.14.1ubuntu6) oneiric; urgency=low
+
+ [ Brian Murray ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - prevent reporting of package installation failures due to inaccessible
+ local files (LP: #791102, #790040)
+ - include /var/log/apt/history.log in apport-package reports so we know
+ the context for the package management request
+
+ [ Michael Vogt ]
+ * methods/mirror.cc:
+ - ignore lines starting with "#" in the mirror file
+ - ignore non http urls in the mirrors
+ - append the dist (e.g. sid, wheezy) as a query string when
+ asking for a suitable mirror
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Jun 2011 15:55:07 +0200
+
+apt (0.8.14.1ubuntu5) oneiric; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ - do not reject empty Packages files when checking them for
+ correctness
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 31 May 2011 10:41:30 +0200
+
+apt (0.8.14.1ubuntu4) oneiric; urgency=low
+
+ [ Julian Andres Klode ]
+ * apt-pkg/acquire-item.cc:
+ - Reject files known to be invalid (LP: #346386) (Closes: #627642)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 May 2011 17:12:27 +0200
+
+apt (0.8.14.1ubuntu3) oneiric; urgency=low
+
+ * Rebuild with recent binutils. LP: #774175.
+
+ -- Matthias Klose <doko@ubuntu.com> Mon, 23 May 2011 19:15:34 +0200
+
+apt (0.8.14.1ubuntu2) oneiric; urgency=low
+
+ * debian/rules:
+ - build in verbose mode by default (thanks to Matthias Klose)
+ * debian/control:
+ - add temporary build-dependency on gcc-4.6 (>= 4.6.0-6ubuntu2)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 May 2011 13:58:10 +0200
+
+apt (0.8.14.1ubuntu1) oneiric; urgency=low
+
+ [ Michael Vogt ]
+ * merged from the debian-sid bzr branch
+
+ [ Julian Andres Klode ]
+ * apt-pkg/depcache.cc:
+ - Really release action groups only once (Closes: #622744)
+ - Make purge work again for config-files (LP: #244598) (Closes: #150831)
+ * debian/apt.cron.daily:
+ - Check power after wait, patch by manuel-soto (LP: #705269)
+ * debian/control:
+ - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
+ unpacked if a library is too old and thus break upgrades
+ * doc/apt-key.8.xml:
+ - Document apt-key net-update (LP: #192810)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Apr 2011 17:55:20 +0200
+
apt (0.8.14.1) unstable; urgency=low
* apt-pkg/acquire-item.cc:
@@ -1879,6 +2658,42 @@ apt (0.8.14) unstable; urgency=low
-- Julian Andres Klode <jak@debian.org> Fri, 15 Apr 2011 14:28:15 +0200
+apt (0.8.13.2ubuntu3) natty-proposed; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - stop reporting of apport-package bug reports regarding
+ dpkg I/O errors (LP: #767776)
+
+ -- Brian Murray <brian@ubuntu.com> Wed, 20 Apr 2011 15:05:12 -0700
+
+apt (0.8.13.2ubuntu2) natty; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.cron.daily:
+ - run unattended-upgrades even if there was a error during
+ the apt-get update (LP: #676295)
+
+ [ Julian Andres Klode ]
+ * apt-pkg/indexcopy.cc:
+ - Use RealFileExists() instead of FileExists(), allows amongst other
+ things a directory named Sources to exist on a CD-ROM (LP: #750694).
+
+ [ David Kalnischkies ]
+ * apt-pkg/pkgcache.cc:
+ - use the native Architecture stored in the cache header instead of
+ loading it from configuration as suggested by Julian Andres Klode
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Apr 2011 12:52:21 +0200
+
+apt (0.8.13.2ubuntu1) natty; urgency=low
+
+ * merge fixes from debian-sid, most notable the handling of
+ arch=all architectures in python-apt (LP: #733741)
+ * apt-pkg/aptconfiguration.cc:
+ - fix comparing for a empty string
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Apr 2011 13:19:56 +0200
+
apt (0.8.13.2) unstable; urgency=low
[ David Kalnischkies ]
@@ -1915,6 +2730,12 @@ apt (0.8.13.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 05 Apr 2011 09:40:28 +0200
+apt (0.8.13.1ubuntu1) natty; urgency=low
+
+ * merged fixes from the debian-sid (LP: #744832)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Apr 2011 14:40:51 +0200
+
apt (0.8.13.1) unstable; urgency=low
* apt-pkg/acquire-item.cc: Use stat buffer if stat was
@@ -1922,6 +2743,24 @@ apt (0.8.13.1) unstable; urgency=low
-- Julian Andres Klode <jak@debian.org> Sat, 02 Apr 2011 20:55:35 +0200
+apt (0.8.13ubuntu2) natty; urgency=low
+
+ * po/makefile:
+ - add hack to run MSGMERGE again if it segfaults. this is to help
+ powerpc to bootstrap
+ * mirror method:
+ - merge fix from Matt Zimmerman, many thanks (LP: #741098)
+ - do not crash if the mirror file fails to download
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 24 Mar 2011 18:01:38 +0100
+
+apt (0.8.13ubuntu1) natty; urgency=low
+
+ * merged from debian/sid, this adds important fixes in the
+ apt mirror method
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Mar 2011 08:23:19 +0100
+
apt (0.8.13) unstable; urgency=low
[ Thorsten Spindler ]
@@ -1943,6 +2782,29 @@ apt (0.8.13) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 16 Mar 2011 08:04:42 +0100
+apt (0.8.12ubuntu2) unstable; urgency=low
+
+ [ Thorsten Spindler ]
+ * methods/rsh.cc
+ - fix rsh/ssh option parsing (LP: #678080), thanks to
+ Ville Mattila
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire-item.cc:
+ - mark pkgAcqIndexTrans as Index-File to avoid asking the
+ user to insert the CD on each apt-get update
+ * methods/mirror.cc:
+ - improve debug output and fix bug in TryNextMirror
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 15:56:54 +0100
+
+apt (0.8.12ubuntu1) natty; urgency=low
+
+ * merged from debian/sid, this adds important fixes in the udev based
+ cdrom handling and multiarch handling
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 16:12:22 +0100
+
apt (0.8.12) unstable; urgency=low
[ Michael Vogt ]
@@ -1996,6 +2858,23 @@ apt (0.8.12) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 10 Mar 2011 14:46:48 +0100
+apt (0.8.11.5ubuntu2) natty; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/debindexfile.cc:
+ - ignore missing deb-src files in /var/lib/apt/lists, thanks
+ to Thorsten Spindler (LP: #85590)
+ * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc:
+ - honor Dpkg::Chroot-Directory in the RunScripts*() methods
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Mar 2011 17:39:30 +0100
+
+apt (0.8.11.5ubuntu1) natty; urgency=low
+
+ * Merged from debian/sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Feb 2011 12:01:19 +0100
+
apt (0.8.11.5) unstable; urgency=low
[ Christian Perrier ]
@@ -2227,6 +3106,27 @@ apt (0.8.10.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 17 Jan 2011 13:41:04 +0100
+apt (0.8.10ubuntu2) UNRELEASED; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - ignore lzma "Cannot allocate memory" errors, thanks to Brian
+ Murray
+ - add i18n support for the "short read in buffer_copy %s" handling
+ from dpkg
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Jan 2011 18:26:05 +0100
+
+apt (0.8.10ubuntu1) natty; urgency=low
+
+ [ Julian Andres Klode ]
+ * cmdline/apt-cache.cc: Create an error for apt-cache depends
+ if packages could not found (LP: #647045)
+
+ [ Michael Vogt ]
+ * merged from debian-sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Dec 2010 15:53:49 +0100
+
apt (0.8.10) unstable; urgency=low
[ Programs translations ]
@@ -2246,6 +3146,48 @@ apt (0.8.10) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 30 Nov 2010 10:42:17 +0100
+apt (0.8.9ubuntu4) natty; urgency=low
+
+ [ Michael Vogt ]
+ * cmdline/apt-key:
+ - set timeout of wget for net-update to 90 seconds (thanks to \sh)
+
+ [ Martin Pitt ]
+ * Revert r1819 and r1820 to disable compressed indexes by default again.
+ Testing has brought up a few places where this seriously degrades
+ performance, mostly in applications which iterate through all available
+ package records, like update-apt-xapian-index or synaptic. See
+ https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 25 Nov 2010 08:50:37 +0100
+
+apt (0.8.9ubuntu3) natty; urgency=low
+
+ * methods/http.cc:
+ - do not hang if Acquire::http::ProxyAutoDetect can not be
+ executed or returns no data (LP: #654393)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 22 Nov 2010 10:42:50 +0100
+
+apt (0.8.9ubuntu2) natty; urgency=low
+
+ * drop apt-changelog, apt-get changelog implements all the
+ features it provides
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 18 Nov 2010 15:22:40 +0100
+
+apt (0.8.9ubuntu1) natty; urgency=low
+
+ * re-merged from the debian-sid bzr branch
+ * merged lp:~mvo/apt/mvo, this brings two new commands:
+ - apt-get download binary-pkgname to download a deb
+ - apt-get changelog binary-pkgname to display the changelog
+ * cmdline/apt-get.cc:
+ - if the changelog download failed, do not show the generic error
+ but point to launchpad instead
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 18 Nov 2010 15:02:14 +0100
+
apt (0.8.9) unstable; urgency=low
[ Christian Perrier ]
@@ -2277,6 +3219,47 @@ apt (0.8.9) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 18 Nov 2010 09:25:04 +0100
+apt (0.8.8ubuntu3) natty; urgency=low
+
+ * cmdline/apt-changelog: Filter out multiple results for a source package,
+ just take the latest one.
+ * cmdline/apt-changelog: Read server name from configuration
+ APT::Changelog::Server instead of hardcoding it. This allows local users
+ to point to a local changelog mirror, or make this script work for Debian.
+ * Add debian/apt.conf.changelog: Configuration for apt-changelog with the
+ server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules.
+ * doc/apt-changelog.1.xml: Document the new option.
+ * test/integration/test-compressed-indexes, test/test-indexes.sh:
+ - Explicitly disable compressed indexes at the start. This ensures that we
+ will actually test uncompressed indexes regardless of the internal
+ default value of Acquire::GzipIndexes.
+ * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to
+ store compressed indexes. This feature is now mature enough for general
+ consumption. Update doc/apt.conf.5.xml accordingly.
+ * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default
+ to preferring "gz", so that compressed indexes will actually work.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 15 Nov 2010 12:14:15 +0100
+
+apt (0.8.8ubuntu2) natty; urgency=low
+
+ * Add cmdline/apt-changelog: Script to fetch package changelog from
+ changelogs.ubuntu.com. Install it in cmdline/makefile and debian/rules.
+ * Add doc/apt-changelog.1.xml, and install it in debian/rules.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 09 Nov 2010 11:32:27 +0100
+
+apt (0.8.8ubuntu1) natty; urgency=low
+
+ * merged from debian-unstable, remainging changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Oct 2010 10:07:09 -0400
+
apt (0.8.8) unstable; urgency=low
[ David Kalnischkies ]
@@ -2296,6 +3279,17 @@ apt (0.8.8) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 28 Oct 2010 21:22:21 +0200
+apt (0.8.7ubuntu1) natty; urgency=low
+
+ * merged from debian-unstable, remainging changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 15 Oct 2010 18:31:17 +0200
+
apt (0.8.7) unstable; urgency=low
[ Manpages translations ]
@@ -2414,6 +3408,92 @@ apt (0.8.4) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 10 Sep 2010 20:45:15 +0200
+apt (0.8.3ubuntu7) maverick; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/depcache.cc:
+ - do not remove packages which the user requested for installation
+ explicitly while satisfying other install requests (Closes: #598669)
+ Test case: debootstrap, install exim4, run "apt-get install postfix"
+ This will result in exim4-heavy instead of postfix
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Oct 2010 14:13:38 +0200
+
+apt (0.8.3ubuntu6) maverick; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.cron.daily:
+ - source /etc/default/locale (if available) so that the
+ apt-get update cron job fetches the right translated package
+ descriptions (LP: #652951)
+
+ [ David Kalnischkies ]
+ * apt-pkg/depcache.cc:
+ - do not check endpointer packages instead of only those which prevented
+ NeverAutoRemove settings from having an effect (Closes: #598452)
+ * cmdline/apt-cache.cc:
+ - use the TranslatedDescription for searching and not the first
+ available one as it is maybe not an expected language (Closes: #597925)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 01 Oct 2010 15:25:00 +0200
+
+apt (0.8.3ubuntu5) maverick; urgency=low
+
+ * debian/apt.dirs:
+ - add missing /usr/share/apt so that the keyring is installed
+ into the right place (LP: #620576)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 22 Sep 2010 18:34:18 +0200
+
+apt (0.8.3ubuntu4) maverick; urgency=low
+
+ * merged lp:~mvo/apt/conflicts-on-virtuals to better deal
+ with conflicts/breaks against virtual packages (LP: #614993)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 15 Sep 2010 19:48:26 +0200
+
+apt (0.8.3ubuntu3) maverick; urgency=low
+
+ * merged fixes from debian-sid
+
+ [ Michael Vogt ]
+ * apt-pkg/contrib/cdromutl.cc:
+ - if apt-cdrom is used on writable media (like usb-sticks), do
+ not use the root directory to identify the medium (as all
+ changes there change the ident id). Use the .disk directory
+ instead
+
+ [ David Kalnischkies ]
+ * ftparchive/writer.cc:
+ - null the valid string instead of the date if Valid-Until is not set
+ * apt-pkg/acquire-item.cc:
+ - use also unsigned Release files again (Closes: #596189)
+
+ [ Christian Perrier ]
+ * Fix missing space after dot in a message from apt-pkg
+ Translations unfuzzied. Thanks to Holger Wansing.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 10 Sep 2010 21:45:49 +0200
+
+apt (0.8.3ubuntu2) maverick; urgency=low
+
+ * ftparchive/writer.cc:
+ - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
+ available LP: #633967. Thanks to Colin Watson
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Sep 2010 15:30:19 +0200
+
+apt (0.8.3ubuntu1) maverick; urgency=low
+
+ * merged fixes from debian-sid
+ * debian/rules:
+ - put ubuntu-archive.gpg back into the package (LP: #620576)
+ * apt-pkg/init.cc:
+ - ignore ".distUpgrade" and ".save" files in sources.list.d
+ (LP: #631770)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Sep 2010 09:27:24 +0200
+
apt (0.8.3) unstable; urgency=low
[ Programs translations ]
@@ -2506,6 +3586,69 @@ apt (0.8.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 03 Sep 2010 18:36:11 +0200
+apt (0.8.0ubuntu3) maverick; urgency=low
+
+ * merged fixes from the debian-sid bzr branch:
+
+ [ Programs translations ]
+ * Simplified Chinese (Aron Xu). Closes: #594458
+ * Bulgarian (Damyan Ivanov). Closes: #594627
+ * Portuguese (Miguel Figueiredo). Closes: #594668
+ * Korean (Changwoo Ryu). Closes: #594809
+
+ [ Manpages translations ]
+ * Portuguese (Américo Monteiro)
+
+ [ David Kalnischkies ]
+ * cmdline/apt-cache.cc:
+ - remove useless GetInitialize method
+ * cmdline/apt-get.cc:
+ - remove direct calls of ReadMainList and use the wrapper instead
+ to protect us from useless re-reads and two-times notice display
+ - remove death code by removing unused GetInitialize
+ * apt-pkg/depcache.cc:
+ - now that apt-get purge works on 'rc' packages let the MarkDelete
+ pass this purge forward to the non-pseudo package for pseudos
+ * apt-pkg/contrib/fileutl.cc:
+ - apply SilentlyIgnore also on files without an extension
+ * apt-pkg/contrib/configuration.cc:
+ - fix autoremove by using correct config-option name and
+ don't make faulty assumptions in error handling (Closes: #594689)
+ * apt-pkg/versionmatch.cc:
+ - let the pin origin actually work as advertised in the manpage
+ which means "" are optional and pinning a local archive does
+ work - even if it is a non-flat archive (Closes: #594435)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 03 Sep 2010 17:05:53 +0200
+
+apt (0.8.0ubuntu2) maverick; urgency=low
+
+ * merged fixes from the debian-sid bzr branch:
+
+ [ Programs translations ]
+ * Thai (Theppitak Karoonboonyanan). Closes: #592695
+ * Russian (Yuri Kozlov). Closes: #594232
+ * Slovak (Ivan Masár). Closes: #594255
+ * Swedish (Daniel Nylander). Closes: #594241
+ * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
+ * Italian (Milo Casagrande). Closes: #594238
+ * Asturian (maacub). Closes: #594303
+
+ [ Christian Perrier ]
+ * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
+ Closes: #594211
+
+ [ David Kalnischkies ]
+ * show in madison command again also source packages (LP: #614589)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Aug 2010 18:56:23 +0200
+
+apt (0.8.0ubuntu1) maverick; urgency=low
+
+ * merged from debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 24 Aug 2010 21:39:06 +0200
+
apt (0.8.0) unstable; urgency=low
[ Michael Vogt ]
@@ -2548,6 +3691,20 @@ apt (0.8.0~pre2) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 23 Aug 2010 19:09:08 +0200
+apt (0.8.0~pre1ubuntu2) maverick; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - enable apport reports again (got lost in the previous merge),
+ thanks to Matt Zimmerman
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 23 Aug 2010 13:53:09 +0200
+
+apt (0.8.0~pre1ubuntu1) maverick; urgency=low
+
+ * merged fixes from debian/experimental
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 13 Aug 2010 17:49:40 +0200
+
apt (0.8.0~pre1) experimental; urgency=low
[ Programs translations ]
@@ -2590,6 +3747,56 @@ apt (0.8.0~pre1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 13 Aug 2010 17:00:49 +0200
+apt (0.7.26~exp12ubuntu4) maverick; urgency=low
+
+ [ Julian Andres Klode ]
+ * apt-pkg/contrib/fileutl.cc:
+ - Add WriteAtomic mode.
+ - Revert WriteEmpty to old behavior (LP: #613211)
+ * apt-pkg, methods:
+ - Convert users of WriteEmpty to WriteAtomic.
+ * apt-pkg/depcache.cc:
+ - Only try upgrade for Breaks if there is a newer version, otherwise
+ handle it as Conflicts (by removing it) (helps for #591882).
+
+ [ Michael Vogt ]
+ * debian/control:
+ - Add recommends on gnupg to apt, apt-key uses it.
+ (changed from debian)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Aug 2010 12:01:30 +0200
+
+apt (0.7.26~exp12ubuntu3) maverick; urgency=low
+
+ [ Colin Watson ]
+ * apt-pkg/cdrom.cc:
+ - fix off-by-one error in DropBinaryArch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 21:04:18 +0200
+
+apt (0.7.26~exp12ubuntu2) maverick; urgency=low
+
+ * debian/apt.postinst:
+ - do not fail if ubuntu-keyring is not installed
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 11:47:59 +0200
+
+apt (0.7.26~exp12ubuntu1) maverick; urgency=low
+
+ * ABI break upload
+ * merged from debian/experimental, remaining changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+ * debian/apt.postinst
+ - drop set_apt_proxy_from_gconf(), no longer needed in maverick
+ * apt-pkg/pkgcache.cc:
+ - re-evaluate the architectures cache when the cache is (re)opened
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 30 Jul 2010 19:32:15 +0200
+
apt (0.7.26~exp12) experimental; urgency=low
[ Michael Vogt ]
@@ -3204,6 +4411,152 @@ apt (0.7.26~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 18 Feb 2010 16:11:39 +0100
+apt (0.7.25.3ubuntu10) maverick; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.conf.ubuntu:
+ - no longer install (empty) apt.conf.d/01ubuntu
+ * apt-pkg/deb/dpkgpm.cc:
+ - make the apt/term.log output unbuffered (thanks to Matt Zimmerman)
+ - fix FTBFS (LP: #600155)
+
+ [ Matthias G. ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - Fix segmentation fault when /var/log/apt ist missing. LP: #535509
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Jul 2010 09:37:03 +0200
+
+apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low
+
+ * debian/apt.postinst:
+ - do not fail if getent returns nothing useful (LP: #579647)
+ thanks to Jean-Baptiste Lallement
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 14 May 2010 09:40:50 +0200
+
+apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low
+
+ [ Loïc Minier ]
+ * Use https:// in Vcs-Bzr URL.
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/debrecords.cc:
+ - fix max tag buffer size (LP: #545336, closes: #578959)
+ * apt-pkg/indexfile.cc:
+ - If no "_" is found in the language code, try to find a "."
+ This is required for languages like Esperanto that have no
+ county associated with them (LP: #560956)
+ Thanks to "Aisano" for the fix
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 May 2010 10:33:46 +0200
+
+apt (0.7.25.3ubuntu7) lucid; urgency=low
+
+ Cherry pick fixes from the lp:~mvo/apt/mvo branch:
+
+ [ Evan Dandrea ]
+ * Remember hosts with general failures for
+ https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
+
+ [ Michael Vogt ]
+ * improve debug output for Debug::pkgPackageManager
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Apr 2010 20:30:03 +0200
+
+apt (0.7.25.3ubuntu6) lucid; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix crash when pkg.VersionList() is empty (LP: #556056)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Apr 2010 21:13:25 +0200
+
+apt (0.7.25.3ubuntu5) lucid; urgency=low
+
+ [ David Kalnischkies ]
+ * cmdline/apt-get.cc:
+ - try version match in FindSrc first exact than fuzzy (LP: #551178)
+
+ [ Jean-Baptiste Lallement ]
+ * apt-pkg/contrib/strutl.cc:
+ - always escape '%' (LP: #130289) (Closes: #500560)
+ - unescape '%' sequence only if followed by 2 hex digit
+ - username/password are urlencoded in proxy string (RFC 3986)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 31 Mar 2010 21:59:42 +0200
+
+apt (0.7.25.3ubuntu4) lucid; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/deb/debversion.cc:
+ - consider absent of debian revision equivalent to 0 (Closes: #573592)
+ LP: #540228
+ * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
+ - fix memory leaks in error conditions in DoSource()
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix error message construction in OpenLog()
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 Mar 2010 16:57:49 +0100
+
+apt (0.7.25.3ubuntu3) lucid; urgency=low
+
+ * apt-pkg/indexfile.cc:
+ - remove "cs" from languages that need the full langcode when
+ downloading translations (thanks to Steve Langasek)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Mar 2010 09:42:39 +0100
+
+apt (0.7.25.3ubuntu2) lucid; urgency=low
+
+ [ Michael Vogt ]
+ * abicheck/
+ - add new abitest tester using the ABI Compliance Checker from
+ http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
+ * debian/apt.conf.autoremove:
+ - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used
+ for transitional packages
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix backgrounding when dpkg runs (closes: #486222)
+ * cmdline/apt-mark:
+ - show error on incorrect aguments (LP: #517917), thanks to
+ Torsten Spindler
+ * cmdline/apt-get.cc:
+ - if apt-get source foo=version or foo/distro can not be found,
+ error out (LP: #502641)
+ * apt-pkg/indexfile.cc:
+ - deal correctly with three letter langcodes (LP: #391409)
+ * debian/apt.cron.daily:
+ - do not look into admin users gconf anymore for the http proxy
+ the user now needs to use the "Apply system-wide" UI in the
+ gnome-control-center to set it
+ * debian/apt.postinst:
+ - add set_apt_proxy_from_gconf() and run that once on upgrade if
+ there is no proxy configured already system-wide (LP: #432631)
+ From that point on gnome-control-center will have to warn if
+ the user makes changes to the proxy settings and does not apply
+ them system wide
+
+ [ Robert Collins ]
+ * Change the package index Info methods to allow apt-cache policy to be
+ useful when using several different archives on the same host.
+ (Closes: #329814, LP: #22354)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 12 Mar 2010 23:10:52 +0100
+
+apt (0.7.25.3ubuntu1) lucid; urgency=low
+
+ [ Michael Vogt ]
+ * merged with the debian-sid branch
+ * methods/http.cc:
+ - add Acquire::http::ProxyAutoDetect configuration that
+ can be used to call a external helper to figure out the
+ proxy configuration and return it to apt via stdout
+ (this is a step towards WPAD and zeroconf/avahi support)
+
+ [ Ivan Masár ]
+ * Slovak translation update. Closes: #568294
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Feb 2010 23:33:32 +0100
+
apt (0.7.25.3) unstable; urgency=low
[ Christian Perrier ]
@@ -3324,6 +4677,39 @@ apt (0.7.25.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Sat, 09 Jan 2010 21:52:36 +0100
+apt (0.7.25ubuntu4) lucid; urgency=low
+
+ * cmdline/apt-cdrom.cc:
+ - make Acquire::cdrom::AutoDetect default, this can be
+ turned off with "--no-auto-detect"
+ * methods/http.cc:
+ - add cache-control headers even if no cache is given to allow
+ adding options for intercepting proxies
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Feb 2010 16:58:59 -0800
+
+apt (0.7.25ubuntu3) lucid; urgency=low
+
+ * cmdline/apt-get.cc:
+ - don't mark as manually if in download only (Closes: #468180)
+
+ -- Michael Vogt <mvo@debian.org> Mon, 01 Feb 2010 18:41:15 +0100
+
+apt (0.7.25ubuntu2) lucid; urgency=low
+
+ * Change history branch so that it does not break the
+ apt ABI for the pkgPackageManager interface
+ (can be reverted on the next ABI break)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Dec 2009 10:14:16 +0100
+
+apt (0.7.25ubuntu1) lucid; urgency=low
+
+ * Merged from the mvo branch
+ * merged from the lp:~mvo/apt/history branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Dec 2009 09:44:08 +0100
+
apt (0.7.25) unstable; urgency=low
[ Christian Perrier ]
@@ -3467,6 +4853,29 @@ apt (0.7.25) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 15 Dec 2009 09:21:55 +0100
+apt (0.7.24ubuntu1) lucid; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - include df -l output in the apport log as well (thanks to
+ tjaalton)
+ * apt-pkg/packagemanager.cc:
+ - add output about pre-depends configuring when debug::pkgPackageManager
+ is used
+ * methods/https.cc:
+ - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
+ thanks to Brian Thomason for the patch
+ * merge lp:~mvo/apt/netrc branch, this adds support for a
+ /etc/apt/auth.conf that can be used to store username/passwords
+ in a "netrc" style file (with the extension that it supports "/"
+ in a machine definition). Based on the maemo git branch.
+
+ [ Brian Murray ]
+ * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
+ - typo fix (LP: #462328)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Dec 2009 09:27:26 +0100
+
apt (0.7.24) unstable; urgency=low
[ Nicolas François ]
@@ -3536,6 +4945,59 @@ apt (0.7.24) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 25 Sep 2009 19:57:25 +0200
+apt (0.7.23.1ubuntu2) karmic; urgency=low
+
+ [ Michael Vogt ]
+ * debian/control:
+ - fix Vcr-Bzr header
+
+ [ Kees Cook ]
+ * debian/apt.cron.daily:
+ - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535).
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Oct 2009 19:05:19 +0200
+
+apt (0.7.23.1ubuntu1) karmic; urgency=low
+
+ [ Matt Zimmerman ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - Suppress apport reports on dpkg short reads (these I/O errors are not
+ generally indicative of a bug in the packaging)
+
+ [ Loïc Minier ]
+ * cmdline/apt-key:
+ - Emit a warning if removed keys keyring is missing and skip associated
+ checks (LP: #218971)
+
+ [ Brian Murray ]
+ * cmdline/apt-get.cc:
+ - typo fix (LP: #370094)
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - when tcgetattr() returns non-zero skip all pty magic
+ (thanks to Simon Richter, closes: #509866)
+ * apt-inst/contrib/arfile.cc:
+ - show propper error message for Invalid archive members
+ * apt-pkg/acquire-worker.cc:
+ - show error details of failed methods
+ * apt-pkg/contrib/fileutl.cc:
+ - if a process aborts with signal, show signal number
+ * methods/http.cc:
+ - ignore SIGPIPE, we deal with EPIPE from write in
+ HttpMethod::ServerDie() (LP: #385144)
+ * debian/apt.cron.daily:
+ - if the timestamp is too far in the future, delete it
+ (LP: #135262)
+
+ [ Merge ]
+ * merged from debian, reverted the libdlopen-udev branch
+ because its too late in the release process for this now
+ * not merged the proxy behaviour change from 0.7.23 (that will
+ be part of lucid)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Sep 2009 18:15:10 +0200
+
apt (0.7.23.1) unstable; urgency=low
[ Michael Vogt ]
@@ -3765,6 +5227,34 @@ apt (0.7.22) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 29 Jul 2009 19:16:22 +0200
+apt (0.7.21ubuntu1) karmic; urgency=low
+
+ * merged from the debian-sid bzr branch
+
+ [ Christian Perrier ]
+ * Documentation translations:
+ - Fix a typo in apt-get(8) French translation. Closes: #525043
+ Thanks to Guillaume Delacour for spotting it.
+ * Translations:
+ - fr.po
+ - sk.po. Closes: #525857
+ - ru.po. Closes: #526816
+ - eu.po. Closes: #528985
+ - zh_CN.po. Closes: #531390
+ - fr.po
+ - it.po. Closes: #531758
+ - ca.po. Closes: #531921
+ * Added translations
+ - ast.po (Asturian by Marcos Alvareez Costales).
+ Closes: #529007, #529730
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire.cc:
+ - make the (internal) max pipeline depth of the acquire queue
+ configurable via Acquire::Max-Pipeline-Depth
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Jun 2009 15:49:07 +0200
+
apt (0.7.21) unstable; urgency=low
[ Christian Perrier ]
@@ -3808,6 +5298,125 @@ apt (0.7.21) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 14 Apr 2009 14:12:51 +0200
+apt (0.7.20.2ubuntu7) karmic; urgency=low
+
+ * fix problematic use of tolower() when calculating the version
+ hash by using locale independant tolower_ascii() function.
+ Thanks to M. Vefa Bicakci (LP: #80248)
+ * build fixes for g++-4.4
+ * include dmesg output in apport package failures
+ * include apt ordering into apport package failures
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 24 Apr 2009 10:14:01 +0200
+
+apt (0.7.20.2ubuntu6) jaunty; urgency=low
+
+ [ Jamie Strandboge ]
+ * apt.cron.daily: catch invalid dates due to DST time changes
+ in the stamp files (LP: #354793)
+
+ [ Michael Vogt ]
+ * methods/gpgv.cc:
+ - properly check for expired and revoked keys (closes: #433091)
+ LP: #356012
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Apr 2009 22:39:50 +0200
+
+apt (0.7.20.2ubuntu5) jaunty; urgency=low
+
+ [ Colin Watson ]
+ * cmdline/acqprogress.cc:
+ - Call pkgAcquireStatus::Pulse even if quiet, so that we still get
+ dlstatus messages on the status-fd (LP: #290234).
+
+ [ Michael Vogt ]
+ * debian/apt.cron.daily:
+ - do not clutter cron mail with bogus gconftool messages
+ (LP: #223502)
+ - merge fix for cache locking from debian (closes: #459344)
+ - run update-apt-xapian-index (with ionice) to ensure that
+ the index is up-to-date when synaptic is run (LP: #288797)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Mar 2009 13:22:28 +0200
+
+apt (0.7.20.2ubuntu4) jaunty; urgency=low
+
+ * ftparchive/cachedb.cc:
+ - when apt-ftparchive clean is used, compact the database
+ at the end (thanks to cprov)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Mar 2009 13:43:59 +0100
+
+apt (0.7.20.2ubuntu3) jaunty; urgency=low
+
+ * methods/mirror.cc:
+ - when download the mirror file and the server is down,
+ return a propper error message (LP: #278635)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Mar 2009 15:42:15 +0100
+
+apt (0.7.20.2ubuntu2) jaunty; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - revert termios patch (LP: #338514)
+ * cmdline/apt-get.cc
+ - fix "apt-get source pkg" if there is a binary package and
+ a source package of the same name but from different
+ packages (LP: #330103)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Mar 2009 16:33:28 +0100
+
+apt (0.7.20.2ubuntu1) jaunty; urgency=low
+
+ [ Christian Perrier ]
+ * Translations:
+ - bg.po. Closes: #513211
+ - zh_TW.po. Closes: #513311
+ - nb.po. Closes: #513843
+
+ [ Michael Vogt ]
+ * merged from the debian-sid branch
+ * [ABI break] merge support for http redirects, thanks to
+ Jeff Licquia and Anthony Towns
+ * [ABI break] use int for the package IDs (thanks to Steve Cotton)
+ * apt-pkg/contrib/strutl.cc:
+ - fix TimeToStr i18n (LP: #289807)
+ * debian/apt.conf.autoremove:
+ - readd "linux-image" (and friends) to the auto-remove
+ blacklist
+ * fix some i18n issues (thanks to Gabor Kelemen)
+ LP: #263089
+ * apt-pkg/deb/dpkgpm.cc:
+ - filter "ENOMEM" errors when creating apport reports
+ * cmdline/apt-get.cc:
+ - fix "apt-get source pkg=ver" if binary name != source name
+ (LP: #202219)
+ * apt-pkg/indexrecords.cc:
+ - fix some i18n issues
+ * apt-pkg/contrib/strutl.h:
+ - add new strprintf() function to make i18n strings easier
+ * apt-pkg/dev/debsystem.cc:
+ - add missing apti18n.h header
+ * cmdline/apt-get.cc:
+ - default to "false" for the "APT::Get::Build-Dep-Automatic"
+ option (follow debian here)
+ * apt-pkg/pkgcache.cc:
+ - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
+ state (LP: #322955)
+ * methods/https.cc:
+ - add Acquire::https::AllowRedirect support
+ - do not unlink files in partial/ (thanks to robbiew)
+
+ [ Dereck Wonnacott ]
+ * Clarify the --help for 'purge' (LP: #243948)
+
+ [ Ian Weisser ]
+ * /apt-pkg/deb/debsystem.cc:
+ - add 'sudo' to the error message to "run 'dpkg --configure -a'"
+ (LP: #52697)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Feb 2009 14:21:05 +0100
+
apt (0.7.20.2) unstable; urgency=medium
[ Eugene V. Lyubimkin ]
@@ -3876,6 +5485,12 @@ apt (0.7.20) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 05 Jan 2009 08:59:20 +0100
+apt (0.7.19ubuntu1) jaunty; urgency=low
+
+ * merge from debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 24 Nov 2008 10:52:20 +0100
+
apt (0.7.19) unstable; urgency=low
[ Eugene V. Lyubimkin ]
@@ -4174,6 +5789,90 @@ apt (0.7.15~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 16 Sep 2008 21:27:03 +0200
+apt (0.7.14ubuntu7) jaunty; urgency=low
+
+ * cmdline/apt-cache.cc:
+ - remove the gettext from a string that consists entirely
+ of variables (LP: #56792)
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix potential hang when in a backgroud process group
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Oct 2008 21:09:12 +0100
+
+apt (0.7.14ubuntu6) intrepid; urgency=low
+
+ * debian/apt.conf.autoremove:
+ - remove "linux-image" (and friends) from the auto-remove
+ blacklist. we have the kernel fallback infrastructure now
+ in intrepid (thanks to BenC)
+ * apt-pkg/indexcopy.cc:
+ - support having CDs with no Packages file (just a Packages.gz)
+ by not forcing a verification on non-existing files
+ (LP: #255545)
+ * apt-pkg/deb/dpkgpm.cc:
+ - improve the filtering for duplicated apport reports (thanks
+ to seb128 for pointing that problem out)
+ - do not report disk full errors from dpkg via apport
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Aug 2008 16:28:05 +0200
+
+apt (0.7.14ubuntu5) intrepid; urgency=low
+
+ * fix various -Wall warnings
+ * make "apt-get build-dep" installed packages marked automatic
+ by default. This can be changed by setting the value of
+ APT::Get::Build-Dep-Automatic to false (thanks to Aaron
+ Haviland, closes: #44874, LP: #248268)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 06 Aug 2008 14:00:51 +0200
+
+apt (0.7.14ubuntu4) intrepid; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix uninitialized variable that caused no apport reports
+ to be written sometimes (thanks to Matt Zimmerman)
+ * merge patch that enforces stricter https server certificate
+ checking (thanks to Arnaud Ebalard, closes: #485960)
+ * allow per-mirror specific https settings
+ (thanks to Arnaud Ebalard, closes: #485965)
+ * add doc/examples/apt-https-method-example.cof
+ (thanks to Arnaud Ebalard, closes: #485964)
+ * add DPkg::NoTriggers option so that applications that call
+ apt/aptitude (like the installer) defer trigger processing
+ (thanks to Joey Hess)
+ * document --install-recommends and --no-install-recommends
+ (thanks to Dereck Wonnacott, LP: #126180)
+
+ [ Dereck Wonnacott ]
+ * apt-ftparchive might write corrupt Release files (LP: #46439)
+ * Apply --important option to apt-cache depends (LP: #16947)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Aug 2008 10:10:49 +0200
+
+apt (0.7.14ubuntu3) intrepid; urgency=low
+
+ [ Otavio Salvador ]
+ * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
+ Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
+ * Avoid using dbus if dbus-daemon isn't running. Closes: #438803
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - improve apt progress reporting, display trigger actions
+ * apt-pkg/depcache.cc:
+ - when checking for new important deps, skip critical ones
+ (LP: #236360)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 Jun 2008 17:27:07 +0200
+
+apt (0.7.14ubuntu2) intrepid; urgency=low
+
+ * debian/control:
+ - fix FTBFS by adding missing intltool dependency
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 09 May 2008 13:50:22 +0200
+
apt (0.7.14) unstable; urgency=low
[ Christian Perrier ]
@@ -4400,6 +6099,268 @@ apt (0.7.10) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 07 Jan 2008 21:40:47 +0100
+apt (0.7.9ubuntu17) hardy-proposed; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ - fix signaure removal on transient network failures LP: #220627
+ (thanks to Scott James Remnant)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Apr 2008 16:32:49 +0200
+
+apt (0.7.9ubuntu16) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - only check against master-keys in net-update to not break
+ custom CDs (thanks to Colin Watson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 08 Apr 2008 14:17:14 +0200
+
+apt (0.7.9ubuntu15) hardy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - do two passes when installing tasks, first ignoring dependencies,
+ then resolving them and run the problemResolver at the end
+ so that it can correct any missing dependencies. This should
+ fix livecd building for kubuntu (thanks to Jonathan Riddell
+ for reporting the problem)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Mar 2008 23:25:45 +0100
+
+apt (0.7.9ubuntu14) hardy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix incorrect help output for -f (LP: #57487)
+ - run the problemResolver after a task was installed
+ so that it can correct any missing dependencies
+ * typo fixes (LP: #107960)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Mar 2008 21:46:07 +0100
+
+apt (0.7.9ubuntu13) hardy; urgency=low
+
+ [ Lionel Porcheron ]
+ * debian/apt.cron.daily:
+ - only call gconftool if gcontool is installed (LP: #194281)
+
+ [ Michael Vogt ]
+ * doc/apt_preferences.5.xml:
+ - fix typo (LP: #150900)
+ * doc/example/sources.list:
+ - updated for hardy (LP: #195879)
+ * debian/apt.cron.daily:
+ - sleep random amount of time (default within 0-30min) before
+ starting the upate to hit the mirrors less hard
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 04 Mar 2008 15:35:09 +0100
+
+apt (0.7.9ubuntu12) hardy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use admin user proxy settings
+ * cmdline/apt-get.cc:
+ - fix task installation (thanks to Colin Watson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Feb 2008 15:07:44 +0100
+
+apt (0.7.9ubuntu11) hardy; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - add APT::Update::Post-Invoke-Success script slot
+ (LP: #188127)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Jan 2008 12:06:12 +0100
+
+apt (0.7.9ubuntu10) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - add "net-update" command that fetches the
+ ubuntu-archive-keyring.gpg and add keys from it that are
+ signed by the ubuntu-master-keyring.gpg
+ (apt-archive-key-signatures spec)
+ * debian/apt.cron.daily:
+ - add apt-key net-update to the nightly cron job
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Feb 2008 15:50:28 +0100
+
+apt (0.7.9ubuntu9) hardy; urgency=low
+
+ * fix FTBFS due to incorrect intltool build-depends
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 16:04:37 +0100
+
+apt (0.7.9ubuntu8) hardy; urgency=low
+
+ * share/apt-auth-failure.note:
+ - show update-notifier note if the nightly update fails with a
+ authentication failure (apt-authentication-reliability spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 14:04:56 +0100
+
+apt (0.7.9ubuntu7) hardy; urgency=low
+
+ * methods/connect.cc:
+ - remember hosts with Resolve failures or connect Timeouts
+ see https://wiki.ubuntu.com/NetworklessInstallationFixes
+ * cmdlines/apt-key:
+ - fix bug in the new apt-key update code that imports only
+ keys signed with the master key (thanks to cjwatson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 08 Feb 2008 11:38:35 +0100
+
+apt (0.7.9ubuntu6) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - add support for a master-keyring that contains signing keys
+ that can be used to sign the archive signing keys. This should
+ make key-rollover easier.
+ * apt-pkg/deb/dpkgpm.cc:
+ - merged patch from Kees Cook to fix anoying upper-case display
+ on amd64 in sbuild
+ * apt-pkg/algorithms.cc:
+ - add APT::Update::Post-Invoke-Success script slot
+ - Make the breaks handling use the kill list. This means, that a
+ Breaks: Pkg (<< version) may put Pkg onto the remove list.
+ * apt-pkg/deb/dpkgpm.cc:
+ - add APT::Apport::MaxReports to limit the maximum number
+ of reports generated in a single run (default to 3)
+ * apt-pkg/deb/debmetaindex.cc:
+ - add missing "Release" file uri when apt-get update --print-uris
+ is run
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Feb 2008 14:28:02 +0100
+
+apt (0.7.9ubuntu5) hardy; urgency=low
+
+ * Merged apt-authentication-reliabilty branch. This means
+ that apt will refuse to update and use the old lists if
+ the authentication of a repository that used to be
+ authenticated fails. See
+ https://wiki.ubuntu.com/AptAuthenticationReliability
+ for more details.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Jan 2008 10:36:10 +0100
+
+apt (0.7.9ubuntu4) hardy; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
+ true, the effect of the compatibility code was to require both of them
+ to be set to false in order to disable list cleanup; this broke the
+ installer. Instead, disable list cleanup if either of them is set to
+ false.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 09 Jan 2008 22:34:37 +0000
+
+apt (0.7.9ubuntu3) hardy; urgency=low
+
+ * merged the apt--DoListUpdate branch, this provides a common interface
+ for "apt-get update" like operations for the frontends and also provides
+ hooks to run stuff in APT::Update::{Pre,Post}-Invoke
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 07 Jan 2008 19:02:11 +0100
+
+apt (0.7.9ubuntu2) hardy; urgency=low
+
+ [ Otavio Salvador ]
+ * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix building
+ with newest dpkg-shlibdeps changing the packaging building order and a
+ patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
+ closes: #452862.
+ * Applied patch from Alexander Winston <alexander.winston@comcast.net>
+ to use 'min' as symbol for minute, closes: #219034.
+ * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to
+ work properly in initramfs, closes: #448316.
+ * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
+ apt-get to ignore time conflicts, closes: #451328.
+ * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
+ grammatical error ("manual installed" -> "manually installed"),
+ closes: #438136.
+ * Fix cron.daily job to not call fail if apt isn't installed, closes:
+ #443286.
+
+ [ Daniel Burrows ]
+ * apt-pkg/contrib/configuration.cc:
+ - if RootDir is set, then FindFile and FindDir will return paths
+ relative to the directory stored in RootDir, closes: #456457.
+
+ [ Christian Perrier ]
+ * Fix wording for "After unpacking...". Thans to Michael Gilbert
+ for the patch. Closes: #260825
+
+ [ Program translations ]
+ - Vietnamese updated. Closes: #453774
+ - Japanese updated. Closes: #456909
+ - French updated.
+
+ [ Michael Vogt ]
+ * apt-pkg/packagemanager.{cc,h}:
+ - propergate the Immediate flag to make hitting the
+ "E: Internal Error, Could not perform immediate configuration (2)"
+ harder. (LP: #179247)
+ * debian/apt.conf.daily:
+ - print warning if the cache can not be locked (closes: #454561),
+ thanks to Bastian Kleineidam
+ * debian/control:
+ - build against libdb-dev (instead of libdb4.4-dev)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Jan 2008 11:31:45 +0100
+
+apt (0.7.9ubuntu1) hardy; urgency=low
+
+ * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining
+ changes:
+ - mirror download method (pending merge with debian)
+ - no pdiff download by default (unsuitable for ubuntu)
+ - no recommends-by-default yet
+ - add "Original-Maintainer" field to tagfile
+ - show warning on apt-get source if the package is maintained
+ in a VCS (pedinging merge with debian)
+ - use ubuntu-archive keyring instead of debians one
+ - support metapackages section for autoremoval
+ - debian maintainer field change
+ - send ubuntu string in user-agent
+
+ * Changes from the debian-sid bzr branch (but not uploaded to debian
+ yet):
+
+ [ Otavio Salvador ]
+ * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
+ apt-mark, closes: #430207.
+ * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
+ note about some frontends in apt.8 manpage, closes: #438545.
+ * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU
+ getting crazy when /dev/null is redirected to stdin (which breaks
+ buildds), closes: #452858.
+
+ [ Program translations ]
+ - Basque updated. Closes: #453088
+
+ [ Michael Vogt ]
+ * debian/rules
+ - fix https install location
+ * methods/gpgv.cc:
+ - remove cruft code that caused timestamp/I-M-S issues
+ * ftparchive/contents.cc:
+ - fix error output
+ * methods/mirror.{cc,h}:
+ - only update mirror list on IndexFile updates
+ * apt-pkg/acquire-item.{cc,h}:
+ - make the authentication download code more robust against
+ servers/proxies with broken If-Range implementations
+ * debian/control:
+ - build against libdb-dev (instead of libdb4.4-dev)
+ * merged the apt--DoListUpdate branch, this provides a common interface
+ for "apt-get update" like operations for the frontends and also provides
+ hooks to run stuff in APT::Update::{Pre,Post}-Invoke
+
+ [ Chris Cheney ]
+ * ftparchive/contents.cc:
+ - support lzma data members
+ * ftparchive/multicompress.cc:
+ - support lzma output
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2007 14:46:27 +0100
+
apt (0.7.9) unstable; urgency=low
[ Christian Perrier ]
@@ -4525,6 +6486,193 @@ apt (0.7.7) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 23 Oct 2007 14:58:03 +0200
+apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - give up timeslice on EIO error in read from master terminal
+ * debian/apt.cron.daily:
+ - only run the cron job if apt-get check succeeds (LP: #131719)
+
+ [ Martin Emrich ]
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - rewrite dpkgpm.cc to use pselect() instead of select()
+ to block signals during select() (LP: #134858)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Sat, 20 Oct 2007 07:51:12 +0200
+
+apt (0.7.6ubuntu14) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix resource leak (LP: #148806)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Oct 2007 20:57:44 +0200
+
+apt (0.7.6ubuntu13) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix crash in WriteApportReport (LP: #144537)
+ * apt-pkg/acquire-item.cc
+ - fix disappearing local Packages.gz file (LP: #131166)
+ * methods/https.cc:
+ - fix off-by-one error I-M-S handling
+ - cleanup after I-M-S hit
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Oct 2007 01:48:26 +0200
+
+apt (0.7.6ubuntu12) gutsy; urgency=low
+
+ [ Michael Vogt ]
+ * cmdline/apt-mark:
+ - Fix chmoding after have renamed the extended-states file
+ (thanks to Laurent Bigonville, LP: #140019)
+ * apt-pkg/deb/debmetaindex.cc: comparison with string literal results
+ in unspecified behaviour;
+ * Reset curl options and timestamp between downloaded files. Thanks to
+ Ryan Murray <rmurray@debian.org> for the patch
+
+ [Paul Sladen]
+ * Have 'cron.daily/apt' send D-Bus doesn't exist error messages
+ to the bit bucket. Thanks to 'dasdda'. (LP: #115397)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 03 Oct 2007 02:17:45 +0200
+
+apt (0.7.6ubuntu11) gutsy; urgency=low
+
+ * apt-pkg/contrib/mmap.cc:
+ - don't fail if msync() returns > 0 (LP: #144001)
+
+ -- Colin Watson <cjwatson@ubuntu.com> Sat, 22 Sep 2007 21:39:29 +0100
+
+apt (0.7.6ubuntu10) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix parse error when dpkg sends unexpected data
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Sep 2007 17:25:09 +0100
+
+apt (0.7.6ubuntu9) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix progress reporting precent calculation (LP: #137798)
+ * make apt build with g++ 4.3
+ * fix missing SetExecClose() call when the status-fd is used
+ (LP: #136767)
+ * debian/apt.cron.daily:
+ - move unattended-upgrade before apt-get autoclean
+ * fix "purge" commandline argument, closes LP: #125733
+ (thanks to Julien Danjou for the patch)
+ * cmdline/apt-get.cc:
+ - do not change the auto-installed information if a package
+ is reinstalled (LP: #139448)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Sep 2007 20:55:00 +0200
+
+apt (0.7.6ubuntu8) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - fix bug in dpkg log writing when a signal is caught during
+ select() (LP: #134858)
+ - write end marker in the log as well
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 Sep 2007 15:03:46 +0200
+
+apt (0.7.6ubuntu7) gutsy; urgency=low
+
+ * reupload to fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 16 Aug 2007 19:44:20 +0200
+
+apt (0.7.6ubuntu6) gutsy; urgency=low
+
+ * dpkg-triggers: Deal properly with new package states.
+
+ -- Ian Jackson <iwj@ubuntu.com> Wed, 15 Aug 2007 20:44:37 +0100
+
+apt (0.7.6ubuntu5) UNRELEASED; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ - fix file removal on local repo i-m-s hit (LP: #131166)
+ * tests/local-repo:
+ - added regression test for this bug
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Aug 2007 12:34:07 +0200
+
+apt (0.7.6ubuntu4) gutsy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - remove YnPrompt when a XS-Vcs- tag is found, improve the
+ notice (LP: #129575)
+ * methods/copy.cc:
+ - take hashes here too
+ * apt-pkg/acquire-worker.cc:
+ - only pass on computed hash if we recived one from the method
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Aug 2007 19:30:29 +0200
+
+apt (0.7.6ubuntu3) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix packagename extraction when writting apport reports
+ * apt-pkg/pkgcachegen.cc:
+ - increase default mmap size (LP: #125640)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Aug 2007 09:52:00 +0200
+
+apt (0.7.6ubuntu2) gutsy; urgency=low
+
+ * doc/examples/sources.list:
+ - change example source to gutsy
+ * apt-pkg/deb/dpkgpm.cc:
+ - do not break if no /dev/pts is available
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 06 Aug 2007 15:17:57 +0200
+
+apt (0.7.6ubuntu1) gutsy; urgency=low
+
+ [ Michael Vogt ]
+ * apt-inst/contrib/extracttar.cc:
+ - fix fd leak for zero size files (thanks to Bill Broadley for
+ reporting this bug)
+ * apt-pkg/acquire-item.cc:
+ - remove zero size files on I-M-S hit
+ * methods/https.cc:
+ - only send LastModified if we actually have a file
+ - send range request with if-range
+ - delete failed downloads
+ (thanks to Thom May for his help here)
+ - delete zero size I-M-S hits
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - merged dpkg-log branch, this lets you specify a
+ Dir::Log::Terminal file to log dpkg output to
+ (ABI break)
+ - when writting apport reports, attach the dpkg
+ terminal log too
+ * merged apt--sha256 branch to fully support the new
+ sha256 checksums in the Packages and Release files
+ (ABI break)
+ * apt-pkg/pkgcachegen.cc:
+ - increase default mmap size
+ * tests/local-repo:
+ - added local repository testcase
+ * make apt build with g++ 4.3
+ * fix missing SetExecClose() call when the status-fd is used
+ * debian/apt.cron.daily:
+ - move unattended-upgrade before apt-get autoclean
+ * fix "purge" commandline argument, closes: #133421
+ (thanks to Julien Danjou for the patch)
+ * cmdline/apt-get.cc:
+ - do not change the auto-installed information if a package
+ is reinstalled
+ * cmdline/apt-mark:
+ - Fix chmoding after have renamed the extended-states file (LP: #140019)
+ (thanks to Laurent Bigonville)
+
+ [ Ian Jackson ]
+ * dpkg-triggers: Deal properly with new package states.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 02 Aug 2007 11:55:54 +0200
+
apt (0.7.6) unstable; urgency=low
* Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
@@ -4552,6 +6700,14 @@ apt (0.7.5) unstable; urgency=low
-- Otavio Salvador <otavio@ossystems.com.br> Wed, 25 Jul 2007 20:16:46 -0300
+apt (0.7.4ubuntu1) gutsy; urgency=low
+
+ * debian/apt.conf.ubuntu, apt.conf.autoremove:
+ - Change metapackages to {restricted,universe,multiverse}/metapackages
+ in Install-Recommends-Sections and Never-MarkAuto-Sections
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Jul 2007 10:42:29 +0200
+
apt (0.7.4) unstable; urgency=low
[ Michael Vogt ]
@@ -4612,6 +6768,90 @@ apt (0.7.3) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Sun, 01 Jul 2007 12:31:29 +0200
+apt (0.7.2ubuntu7) gutsy; urgency=low
+
+ * fix build-dependencies
+ * fixes in the auto-mark code (thanks to Daniel
+ Burrows)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 9 Jul 2007 19:02:54 +0200
+
+apt (0.7.2ubuntu6) gutsy; urgency=low
+
+ [ Michael Vogt]
+ * cmdline/apt-get.cc:
+ - make the XS-Vcs-$foo warning more copy'n'paste
+ friendly (thanks to Matt Zimmerman)
+ - ignore the Vcs-Browser tag (Fixes LP: #121770)
+ * debian/apt.conf.autoremove:
+ - added "linux-ubuntu-modules" to APT::NeverAutoRemove
+
+ [ Sarah Hobbs ]
+ * Change metapackages to *metapackages in Install-Recommends-Section
+ and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that
+ the Recommends of metapackages in universe and multiverse will get
+ installed.
+ * Also make this change in doc/examples/configure-index.
+ * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto,
+ docbook to fix FTBFS.
+ * Added in previous changelog entries, as those who uploaded did not
+ actually commit to Bzr.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 09 Jul 2007 01:15:57 +1000
+
+apt (0.7.2ubuntu5) gutsy; urgency=low
+
+ * Rerun autoconf to fix the FTBFS.
+
+ -- Michael Bienia <geser@ubuntu.com> Fri, 06 Jul 2007 19:17:33 +0200
+
+apt (0.7.2ubuntu4) gutsy; urgency=low
+
+ * Rebuild for the libcurl4 -> libcurl3 transition mess.
+
+ -- Steve Kowalik <stevenk@ubuntu.com> Fri, 6 Jul 2007 12:44:05 +1000
+
+apt (0.7.2ubuntu3) gutsy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix InstallTask code when a pkgRecord ends
+ with a single '\n' (thanks to Soren Hansen for reporting)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 27 Jun 2007 13:33:38 +0200
+
+apt (0.7.2ubuntu2) gutsy; urgency=low
+
+ * fixed compile errors with g++ 4.3 (thanks to
+ Daniel Burrows, closes: #429378)
+ * fix FTFBFS by changing build-depends to
+ libcurl4-gnutls-dev (closes: #428363)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Jun 2007 13:47:03 +0200
+
+apt (0.7.2ubuntu1) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - apport integration added, this means that a apport
+ report is written on dpkg failures
+ * cmdline/apt-get.cc:
+ - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
+ this will warn when Vcs- headers are found on apt-get source
+ (Fixes LP:#115959)
+ * merged from debian/unstable, remaining changes:
+ - maintainer field changed
+ - merged the apt--mirror branch
+ http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/
+ - apport reporting on package install/upgrade/remove failure
+ - support for "Originial-Maintainer" field
+ - merged apt--xs-vcs-bzr branch
+ (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/)
+ - use ubuntu archive keyring by default
+ - debian/apt.conf.autoremove
+ + install recommands for section "metapackages"
+ + do not mark direct dependencies of "metapackages" as autoremoved
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jun 2007 10:38:36 +0200
+
apt (0.7.2-0.1) unstable; urgency=low
* Non-maintainer upload.
@@ -4734,6 +6974,116 @@ apt (0.7.0) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100
+apt (0.6.46.4ubuntu10) feisty; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - added "APT::Never-MarkAuto-Section" and consider dependencies
+ of packages in this section manual (LP#59893)
+ - ensure proper permissions in the extended_state file (LP#67037)
+ * debian/apt.conf.ubuntu:
+ - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
+ * cmdline/apt-get.cc:
+ - "apt-get install foo" on a already installed package foo will
+ clean the automatic installed flag (LP#72007)
+ - do not show packages already marked for removal as auto-installed
+ (LP#64493)
+ - applied patch to (optionally) hide the auto-remove information
+ (thanks to Frode M. Døving) (LP#69148)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Mar 2007 13:32:32 +0100
+
+apt (0.6.46.4ubuntu9) feisty; urgency=low
+
+ * debian/control:
+ - set XS-Vcs-Bzr header
+ - Set Ubuntu maintainer address
+ * apt-pkg/cdrom.cc:
+ - only unmount if APT::CDROM::NoMount is false
+ - only umount if it was mounted by the method before
+ * cmdline/apt-get.cc:
+ - fix version output in autoremove list (LP#68941)
+ * apt-pkg/packagemanager.cc:
+ - do not spin 100% cpu in FixMissing() (LP#84476)
+ * apt-pkg/indexfile.cc:
+ - fix problem overwriting APT::Acquire::Translation
+ * doc/examples/configure-index:
+ - document APT::Acquire::Translation
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Mar 2007 15:24:39 +0100
+
+apt (0.6.46.4ubuntu8) feisty; urgency=low
+
+ * fix segfault in the pkgRecords destructor
+ * Bump ABI version
+ * debian/control:
+ - make the libcurl3-gnutls-dev versionized (LP#86614)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Feb 2007 14:26:33 +0100
+
+apt (0.6.46.4ubuntu7) feisty; urgency=low
+
+ * Merged the apt--mirror branch. This means that a new 'mirror'
+ method is available that will allow dynamic mirror updates.
+ The sources.list entry looks something like this:
+ "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
+
+ It also supports error reporting to a configurable url for mirror
+ problems/failures.
+ * Bump ABI version
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Feb 2007 11:38:06 +0100
+
+apt (0.6.46.4ubuntu6) feisty; urgency=low
+
+ * methods/http.cc:
+ - send apt version in User-Agent
+ * apt-pkg/deb/debrecords.cc:
+ - fix SHA1Hash() return value
+ * apt-pkg/algorithms.cc:
+ - fix resolver bug on removal triggered by weak-dependencies
+ with or-groups
+ - fix segfault (lp: #76530)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Dec 2006 11:04:36 +0100
+
+apt (0.6.46.4ubuntu5) feisty; urgency=low
+
+ * added apt-transport-https package to provide a optional
+ https transport (apt-https spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Dec 2006 16:23:43 +0100
+
+apt (0.6.46.4ubuntu4) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - only increase the score of installed applications if they
+ are not obsolete
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100
+
+apt (0.6.46.4ubuntu3) feisty; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - use clog for all debugging
+ * apt-pkg/depcache.cc:
+ - never mark Required package for autoremoval (lp: #75882)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 11:56:05 +0100
+
+apt (0.6.46.4ubuntu2) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc: add missing call to MarkKeep
+ so that dist-upgrade isn't broken by unsatisfiable Breaks.
+ (thanks to Ian Jackson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 23:07:24 +0100
+
+apt (0.6.46.4ubuntu1) feisty; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 12:13:14 +0100
+
apt (0.6.46.4-0.1) unstable; urgency=emergency
* NMU
@@ -4763,13 +7113,33 @@ apt (0.6.46.4) unstable; urgency=high
-- Michael Vogt <mvo@debian.org> Thu, 7 Dec 2006 10:49:50 +0100
+apt (0.6.46.3ubuntu2) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc: add missing call to MarkKeep
+ so that dist-upgrade isn't broken by unsatisfiable Breaks.
+
+ -- Ian Jackson <iwj@ubuntu.com> Thu, 7 Dec 2006 15:46:52 +0000
+
+apt (0.6.46.3ubuntu1) feisty; urgency=low
+
+ * doc/apt-get.8.xml:
+ - documented autoremove, thanks to Vladimír Lapá%Gč%@ek
+ (lp: #62919)
+ * fix broken i18n in the dpkg progress reporting, thanks to
+ Frans Pop and Steinar Gunderson. (closes: #389261)
+ * po/en_GB.po:
+ - typo (lp: #61270)
+ * add apt-secure.8 to "See also" section
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 23 Nov 2006 07:24:12 +0100
+
apt (0.6.46.3-0.2) unstable; urgency=high
* Non-maintainer upload with permission of Michael Vogt.
* Fix FTBFS on most arches (regression from the fix of #400874)
-- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 15:51:22 +0000
-
+
apt (0.6.46.3-0.1) unstable; urgency=high
* Non-maintainer upload with permission of Michael Vogt.
@@ -4875,6 +7245,173 @@ apt (0.6.46) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 21 Sep 2006 10:25:03 +0200
+apt (0.6.45ubuntu14) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the TryInstallTask() code to make sure that all package
+ there are marked manual install (lp: #61684)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200
+
+apt (0.6.45ubuntu13) edgy; urgency=low
+
+ * no-changes upload to make apt rebuild against latest g++ and
+ fix synaptic FTBFS (see bug: #62461 for details)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 22:33:10 +0200
+
+apt (0.6.45ubuntu12) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix in the sweep() code, set garbage flag for packages scheduled
+ for removal too
+ - do not change the autoFlag in MarkKeep(), this can lead to suprising
+ side effects
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Sep 2006 00:58:24 +0200
+
+apt (0.6.45ubuntu11) edgy; urgency=low
+
+ * removed "installtask" and change it so that tasknames can be given
+ with "apt-get install taskname^"
+ * improve the writeStateFile() code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 14:14:24 +0200
+
+apt (0.6.45ubuntu10) edgy; urgency=low
+
+ * methods/http.cc:
+ - check more careful for incorrect proxy settings (closes: #378868)
+ * methods/gzip.cc:
+ - don't hang when /var is full (closes: #341537), thanks to
+ Luis Rodrigo Gallardo Cruz for the patch
+ * doc/examples/sources.list:
+ - removed non-us.debian.org from the example (closes: #380030,#316196)
+ * Merged from Christian Perrier bzr branch:
+ * ro.po: Updated to 514t. Closes: #388402
+ * dz.po: Updated to 514t. Closes: #388184
+ * it.po: Fixed typos. Closes: #387812
+ * ku.po: New kurdish translation. Closes: #387766
+ * sk.po: Updated to 514t. Closes: #386851
+ * ja.po: Updated to 514t. Closes: #386537
+ * gl.po: Updated to 514t. Closes: #386397
+ * fr.po: Updated to 516t.
+ * fi.po: Updated to 512t. Closes: #382702
+ * share/archive-archive.gpg:
+ - removed the outdated amd64 and debian-2004 keys
+ * apt-pkg/tagfile.cc:
+ - applied patch from Jeroen van Wolffelaar to make the tags
+ caseinsensitive (closes: #384182)
+ - reverted MMap use in the tagfile because it does not work
+ across pipes (closes: #383487)
+ * added "installtask" command
+ * added new ubuntu specific rewrite rule for "Original-Maintainer"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Sep 2006 15:07:51 +0200
+
+apt (0.6.45ubuntu9) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - if --no-remove is given, do not run the AutoRemove code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Sep 2006 11:54:20 +0200
+
+apt (0.6.45ubuntu8) edgy; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - fix pkgProblemResolver.InstallProtect() to preserve the auto-install
+ information (lp: #59457)
+ * cmdline/apt-get.cc:
+ - fix typo in autoremove information (lp: #59420)
+ * install apt-mark to modify the automatically install information for
+ packages
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 8 Sep 2006 20:07:22 +0200
+
+apt (0.6.45ubuntu7) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix a bug in the install-recommends-section code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 18:22:38 +0200
+
+apt (0.6.45ubuntu6) edgy; urgency=low
+
+ [Michael Vogt]
+ * cmdline/apt-get.cc:
+ - always show auto-removable packages and give a hint how to remove
+ them
+ * debian/apt.conf.ubuntu:
+ - exlucde linux-image and linux-restricted-modules from ever being
+ auto-removed
+ - added "metapackages" as the section we want to install recommends
+ by default
+ * apt-pkg/depcache.cc:
+ - added support to turn install-recommends selectively on/off by
+ section
+ [Ian Jackson]
+ * Tests pass without code changes! Except that we need this:
+ * Bump cache file major version to force rebuild so that Breaks
+ dependencies are included.
+ * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
+ --auto-deconfigure is very very old and dpkg-dev's Breaks support
+ is more or less orthogonal.
+ * Initial draft of `Breaks' implementation. Appears to compile,
+ but as yet *completely untested*.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 11:50:52 +0200
+
+apt (0.6.45ubuntu5) edgy; urgency=low
+
+ * apt-pkg/pkgcachegen.cc:
+ - increase the APT::Cache-Limit to deal with the increased demand due
+ to the translated descriptions
+ * apt-pkg/deb/dpkgpm.cc:
+ - pass "--auto-deconfigure" to dpkg on install to support the
+ new "breaks" in dpkg
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 12:06:26 +0200
+
+apt (0.6.45ubuntu4) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the new --fix-polciy code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 21:08:11 +0200
+
+apt (0.6.45ubuntu3) edgy; urgency=low
+
+ * ABI break
+ * merged latest apt--install-recommends (closes: #559000)
+ * added "--fix-policy" option to can be used as "--fix-broken" and
+ will install missing weak depends (recommends, and/or suggests
+ depending on the settings)
+ * merged the apt--ddtp branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 11 Aug 2006 12:53:23 +0200
+
+apt (0.6.45ubuntu2) edgy; urgency=low
+
+ * debian/control:
+ - switched to libdb4.4 for building (closes: #381019)
+ * cmdline/apt-get.cc:
+ - show only the recommends/suggests for the candidate-version, not for all
+ versions of the package (closes: #257054)
+ - properly handle recommends/suggests or-groups when printing the list of
+ suggested/recommends packages (closes: #311619)
+ * merged "apt--install-recommends" branch:
+ - added "{no-}install-recommends" commandline option
+ - added APT::Install-{Recommends,Suggests} option
+ - currently Install-Recommends defaults to "False"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 23:38:46 +0200
+
+apt (0.6.45ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 1 Aug 2006 15:43:22 +0200
+
apt (0.6.45) unstable; urgency=low
* apt-pkg/contrib/sha256.cc:
@@ -4920,6 +7457,37 @@ apt (0.6.45) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200
+apt (0.6.44.2ubuntu4) edgy; urgency=low
+
+ * Make apt-get dselect-upgrade happy again
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200
+
+apt (0.6.44.2ubuntu3) edgy; urgency=low
+
+ * Close extended_states file after writing it.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100
+
+apt (0.6.44.2ubuntu2) edgy; urgency=low
+
+ * create a empty extended_states file if none exists already
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200
+
+apt (0.6.44.2ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+ * merged the "auto-mark" branch to support aptitude like
+ marking of automatically installed dependencies and added
+ "apt-get remove --auto-remove" to remove unused auto-installed
+ packages again
+ * changed library version from 3.11 to 3.50 to make it clearly
+ different from the debian version (we are ABI incompatible because
+ of the auto-mark patch)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200
+
apt (0.6.44.2exp1) experimental; urgency=low
* added support for i18n of the package descriptions
@@ -5008,6 +7576,26 @@ apt (0.6.44) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200
+apt (0.6.43.3ubuntu3) dapper; urgency=low
+
+ * methods/http.cc:
+ - fix the user-agent string
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 May 2006 18:09:32 +0200
+
+apt (0.6.43.3ubuntu2) dapper; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Apr 2006 13:24:40 +0200
+
+apt (0.6.43.3ubuntu1) dapper; urgency=low
+
+ * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in
+ the status-fd (ubuntu #28954)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200
+
apt (0.6.43.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
@@ -5040,6 +7628,38 @@ apt (0.6.43.3) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+apt (0.6.43.2ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
+ * apt-pkg/deb/deblistparser.cc:
+ - don't explode on a DepCompareOp in a Provides line, but warn about
+ it and ignore it otherwise (thanks to James Troup for reporting it)
+ * cmdline/apt-get.cc:
+ - don't lock the lists directory in DoInstall, breaks --print-uri
+ (thanks to James Troup for reporting it)
+ * debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100
+
apt (0.6.43.2) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
@@ -5063,6 +7683,24 @@ apt (0.6.43.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
+apt (0.6.43.1ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+ - en_GB.po, de.po: fix spaces errors in "Ign " translations
+ Closes: #347258
+ - makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+ - sv.po: Completed to 511t. Closes: #346450
+ - sk.po: Completed to 511t. Closes: #346369
+ - fr.po: Completed to 511t
+ - *.po: Updated from sources (511 strings)
+ * add patch to fix http download corruption problem (thanks to
+ Petr Vandrovec, closes: #280844, #290694)
+ * added APT::Periodic::Unattended-Upgrade (requires the package
+ "unattended-upgrade")
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+
apt (0.6.43.1) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
@@ -5086,6 +7724,19 @@ apt (0.6.43.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100
+apt (0.6.43ubuntu2) dapper; urgency=low
+
+ * merged some missing bits that wheren't merged by baz in the previous
+ upload (*grumble*)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100
+
+apt (0.6.43ubuntu1) dapper; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100
+
apt (0.6.43) unstable; urgency=medium
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:
@@ -5106,6 +7757,22 @@ apt (0.6.43) unstable; urgency=medium
-- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
+apt (0.6.42.3ubuntu2) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:
+ * zh_CN.po: Completed to 507 strings(Closes: #338267)
+ * gl.po: Completed to 510 strings (Closes: #338356)
+ * added support for "/etc/apt/sources.list.d" directory
+ (closes: #66325)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100
+
+apt (0.6.42.3ubuntu1) dapper; urgency=low
+
+ * synced with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100
+
apt (0.6.42.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
@@ -5134,7 +7801,7 @@ apt (0.6.42.2) unstable; urgency=high
* Priority high to get the AMD key into testing ASAP.
-- Frans Pop <fjp@debian.org> Sun, 30 Oct 2005 21:29:11 +0100
-
+
apt (0.6.42.1) unstable; urgency=low
* fix a incorrect example in the apt_prefrences man page
@@ -5212,6 +7879,80 @@ apt (0.6.41) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200
+apt (0.6.40.1ubuntu8) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
+ - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
+ * po/de.po, po/fr.po:
+ - updated the translations
+ * po/makefile:
+ - create a single pot file in each domain dir to make rosetta happy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200
+
+apt (0.6.40.1ubuntu7) breezy; urgency=low
+
+ * updated the pot/po files , no code changes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200
+
+apt (0.6.40.1ubuntu6) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
+ - make it possible for apt to handle a failed MediaChange event and
+ fall back to other sources (ubuntu #13713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200
+
+apt (0.6.40.1ubuntu5) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
+ This adds media-change reporting to the apt status-fd (ubuntu #15213)
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
+ apt-pkg/cdrom.cc:
+ - unmount the cdrom when apt failed to locate any package files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200
+
+apt (0.6.40.1ubuntu4) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - fix a embarrassing typo
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200
+
+apt (0.6.40.1ubuntu3) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use the ctime as well when figuring what packages need to
+ be removed. This fixes the problem that packages copied with
+ "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200
+
+apt (0.6.40.1ubuntu2) breezy; urgency=low
+
+ * improved the support for "error" and "conffile" reporting from
+ dpkg, added the format to README.progress-reporting
+ * added README.progress-reporting to the apt-doc package
+ * Do md5sum checking for file and cdrom method (closes: #319142)
+ * Change pkgPolicy::Pin from private to protected to let subclasses
+ access it too (closes: #321799)
+ * methods/connect.cc:
+ - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
+ * apt-pkg/acquire-item.cc:
+ - fail early if a FailReason is TmpResolveFailure (avoids hangs during
+ the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
+
+apt (0.6.40.1ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
+
apt (0.6.40.1) unstable; urgency=low
* bugfix in the parsing code for the apt<->dpkg communication. apt
@@ -5221,6 +7962,12 @@ apt (0.6.40.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
+apt (0.6.40ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
+
apt (0.6.40) unstable; urgency=low
* Patch from Jordi Mallach to mark some additional strings for translation
@@ -5236,6 +7983,39 @@ apt (0.6.40) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700
+apt (0.6.39ubuntu4) breezy; urgency=low
+
+ * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
+ before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu3) breezy; urgency=low
+
+ * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+ /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+ * Michael Vogt
+ - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ - Fix a incorrect example in the man-page (closes: #282918)
+ - Support architecture-specific extra overrides
+ (closes: #225947). Thanks to Anthony Towns for idea and
+ the patch, thanks to Colin Watson for testing it.
+ - better report network timeouts from the methods to the acuire code,
+ only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700
+
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -5248,6 +8028,13 @@ apt (0.6.39) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
+
apt (0.6.38) unstable; urgency=low
* Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
@@ -7126,3 +9913,4 @@ apt (0.0.1) unstable; urgency=low
* Initial Release.
-- Scott K. Ellis <scott@debian.org> Tue, 31 Mar 1998 12:49:28 -0500
+
diff --git a/debian/control b/debian/control
index 49647340a..5cdacfc34 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: apt
Section: admin
Priority: important
-Maintainer: APT Development Team <deity@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
Julian Andres Klode <jak@debian.org>
@@ -12,12 +13,12 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
po4a (>= 0.34-2), autotools-dev, autoconf, automake
Build-Depends-Indep: doxygen, debiandoc-sgml
Build-Conflicts: autoconf2.13, automake1.4
-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
+Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu
+Vcs-Browser: http://code.launchpad.net/apt/ubuntu
Package: apt
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg
+Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg
Replaces: manpages-pl (<< 20060617-3~), manpages-it
Conflicts: python-apt (<< 0.7.93.2~)
Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt
diff --git a/debian/rules b/debian/rules
index 5051dab4f..a2dbe513e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# Some lines taken from debmake, by Christoph Lameter.
+# build in verbose mode by default to make it easy to diangose issues
+export NOISY=1
+
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -182,6 +185,10 @@ apt: build build-manpages
# apt install
#
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
+ cp debian/apt.conf.changelog debian/$@/etc/apt/apt.conf.d/20changelog
+ cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal
+ chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal
+ cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
# make rosetta happy and remove pot files in po/ (but leave stuff
# in po/domains/* untouched) and cp *.po into each domain dir
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 6a36d08ca..9d51f4f7b 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -130,7 +130,7 @@
Update the local keyring with the archive keyring and remove from
the local keyring the archive keys which are no longer valid.
The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
- distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
+ distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in Ubuntu.
</para>
@@ -180,12 +180,12 @@
<listitem><para>Local trust database of archive keys.</para></listitem>
</varlistentry>
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
- <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
+ <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term>
+ <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem>
</varlistentry>
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
- <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
+ <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename></term>
+ <listitem><para>Keyring of Ubuntu archive removed trusted keys.</para></listitem>
</varlistentry>
</variablelist>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 2d6e96091..631a7dcab 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.9~exp3">
+<!ENTITY apt-product-version "0.9.7.9~exp3ubuntu1">
<!-- Codenames for debian releases -->
<!ENTITY oldstable-codename "squeeze">
diff --git a/doc/examples/sources.list.in b/doc/examples/sources.list.in
index 745e32cbe..00db2f8cd 100644
--- a/doc/examples/sources.list.in
+++ b/doc/examples/sources.list.in
@@ -1,8 +1,10 @@
# See sources.list(5) manpage for more information
# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
-deb http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-deb http://security.debian.org &stable-codename;/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
-# Uncomment if you want the apt-get source function to work
-#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free
-#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free
+deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted
+deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted
+
+deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted
diff --git a/doc/makefile b/doc/makefile
index be8357d80..2516cd128 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -42,7 +42,7 @@ SOURCE = apt.8
include $(MANPAGE_H)
examples/sources.list: examples/sources.list.in apt-verbatim.ent
- sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
+ sed -e 's#&ubuntu-codename;#$(shell grep --max-count=1 '^<!ENTITY ubuntu-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
# Examples
SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 9ecd1ac03..b20761bf9 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 0.9.7.9~exp2\n"
+"Project-Id-Version: apt-doc 0.9.7.9~exp3ubuntu1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\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"
@@ -1620,8 +1620,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1670,22 +1670,22 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
-msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index e4c7420b4..e2052297f 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-06-25 22:49+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -2261,12 +2261,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und "
"entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen "
@@ -2335,24 +2342,33 @@ msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
"Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs"
diff --git a/doc/po/es.po b/doc/po/es.po
index ade98d9cb..bfdfd6372 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-07-14 12:21+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -2330,12 +2330,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Actualiza el registro de claves local con el registro de claves del archivo "
"y elimina del registro local las claves de archivo que ya no son válidas. El "
@@ -2404,24 +2411,33 @@ msgstr "Base de datos local de las claves de confianza de archivos Debian"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Registro de las claves de confianza del archivo de Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Registro de las claves de confianza eliminadas del archivo de Debian."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 8663c0758..5c7f521c9 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2013-04-09 07:56+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -51,8 +51,7 @@ msgid ""
msgstr ""
"<!ENTITY apt-qapage \"\n"
"\t<para>\n"
-"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>"
-"\n"
+"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>\n"
"\t</para>\n"
"\">\n"
@@ -74,8 +73,7 @@ msgstr ""
"<!-- Boiler plate Bug reporting section -->\n"
"<!ENTITY manbugs \"\n"
" <refsect1><title>Bogues</title>\n"
-" <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT<"
-"/ulink>. \n"
+" <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
" Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
" <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utiliser\n"
" la commande &reportbug;.\n"
@@ -90,8 +88,7 @@ msgid ""
"<!-- Boiler plate Author section -->\n"
"<!ENTITY manauthor \"\n"
" <refsect1><title>Author</title>\n"
-" <para>APT was written by the APT team <email>apt@packages.debian.org<"
-"/email>.\n"
+" <para>APT was written by the APT team <email>apt@packages.debian.org</email>.\n"
" </para>\n"
" </refsect1>\n"
"\">\n"
@@ -99,8 +96,7 @@ msgstr ""
"<!-- Boiler plate Author section -->\n"
"<!ENTITY manauthor \"\n"
" <refsect1><title>Author</title>\n"
-" <para>APT a été écrit par l'équipe de développement APT <email>"
-"apt@packages.debian.org</email>.\n"
+" <para>APT a été écrit par l'équipe de développement APT <email>apt@packages.debian.org</email>.\n"
" </para>\n"
" </refsect1>\n"
"\">\n"
@@ -156,12 +152,10 @@ msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
-" <listitem><para>Configuration File; Specify a configuration file to use. "
-"\n"
+" <listitem><para>Configuration File; Specify a configuration file to use. \n"
" The program will read the default configuration file and then this \n"
" configuration file. If configuration settings need to be set before the\n"
-" default configuration files are parsed specify a file with the <envar>"
-"APT_CONFIG</envar>\n"
+" default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
" environment variable. See &apt-conf; for syntax information.\n"
" </para>\n"
" </listitem>\n"
@@ -170,15 +164,10 @@ msgstr ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
-" <listitem><para>Fichier de configuration ; indique le fichier de "
-"configuration à utiliser. \n"
-" Le programme lira le fichier de configuration par défaut puis le fichier "
-"indiqué ici. \n"
-" Si les réglages de configuration doivent être établis avant l'analyse "
-"des fichiers\n"
-" de configuration par défaut, un fichier peut être indiqué avec la "
-"variable d'environnement <envar>APT_CONFIG</envar>. Veuillez consulter "
-"&apt-conf; pour des informations sur la syntaxe d'utilisation. \n"
+" <listitem><para>Fichier de configuration ; indique le fichier de configuration à utiliser. \n"
+" Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
+" Si les réglages de configuration doivent être établis avant l'analyse des fichiers\n"
+" de configuration par défaut, un fichier peut être indiqué avec la variable d'environnement <envar>APT_CONFIG</envar>. Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation. \n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -203,10 +192,8 @@ msgstr ""
" <term><option>-o</option></term>\n"
" <term><option>--option</option></term>\n"
" <listitem><para>Définir une option de configuration ; permet de régler\n"
-" une option de configuration donnée. La syntaxe est <option>-o "
-"Foo::Bar=bar</option>.\n"
-" <option>-o</option> et <option>--option</option> peuvent être utilisées "
-"plusieurs fois\n"
+" une option de configuration donnée. La syntaxe est <option>-o Foo::Bar=bar</option>.\n"
+" <option>-o</option> et <option>--option</option> peuvent être utilisées plusieurs fois\n"
" pour définir des options différentes.\n"
" </para>\n"
" </listitem>\n"
@@ -220,8 +207,7 @@ msgid ""
"<!-- Should be used within the option section of the text to\n"
" put in the blurb about -h, -v, -c and -o -->\n"
"<!ENTITY apt-cmdblurb \"\n"
-" <para>All command line options may be set using the configuration file, "
-"the\n"
+" <para>All command line options may be set using the configuration file, the\n"
" descriptions indicate the configuration option to set. For boolean\n"
" options you can override the config file by using something like \n"
" <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
@@ -232,12 +218,9 @@ msgstr ""
"<!-- Should be used within the option section of the text to\n"
" put in the blurb about -h, -v, -c and -o -->\n"
"<!ENTITY apt-cmdblurb \"\n"
-" <para>Toutes les options de la ligne de commande peuvent être définies "
-"dans le fichier de configuration, \n"
-" les descriptions indiquant l'option de configuration concernée. Pour les "
-"options\n"
-" booléennes, vous pouvez inverser les réglages du fichiers de configuration "
-"avec \n"
+" <para>Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n"
+" les descriptions indiquant l'option de configuration concernée. Pour les options\n"
+" booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n"
" <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
" et d'autres variantes analogues.\n"
" </para>\n"
@@ -250,15 +233,13 @@ msgid ""
"<!ENTITY file-aptconf \"\n"
" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
" <listitem><para>APT configuration file.\n"
-" Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>"
-"\n"
+" Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-aptconf \"\n"
" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
" <listitem><para>Fichier de configuration d'APT.\n"
-" Élément de configuration : <literal>Dir::Etc::Main</literal>.</para><"
-"/listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -267,15 +248,13 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
" <listitem><para>APT configuration file fragments.\n"
-" Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>"
-"\n"
+" Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
" <listitem><para>Fragments du fichier de configuration d'APT.\n"
-" Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para><"
-"/listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -286,34 +265,28 @@ msgid ""
"<!ENTITY file-cachearchives \"\n"
" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
" <listitem><para>Storage area for retrieved package files.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-cachearchives \"\n"
" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
" <listitem><para>Zone de stockage des fichiers récupérés.\n"
-" Élément de configuration : <literal>Dir::Cache::Archives</literal>.<"
-"/para></listitem>\n"
+" Élément de configuration : <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
#: apt.ent:109
#, no-wrap
msgid ""
-" <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
-"/term>\n"
+" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>"
-"partial</filename> will be implicitly appended)</para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
-" <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
-"/term>\n"
+" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Zone de stockage pour les paquets en transit.\n"
-" Élément de configuration : <literal>Dir::Cache::Archives</literal> (<"
-"filename>partial</filename> sera implicitement ajouté). </para></listitem>\n"
+" Élément de configuration : <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> sera implicitement ajouté). </para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -328,18 +301,14 @@ msgid ""
" i.e. a preference to get certain packages\n"
" from a separate source\n"
" or from a different version of a distribution.\n"
-" Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-preferences \"\n"
" <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
" <listitem><para>Fichier des préférences.\n"
-" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) "
-"c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une "
-"distribution différente.\n"
-" Élément de configuration : <literal>Dir::Etc::Preferences</literal>.<"
-"/para></listitem>\n"
+" C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n"
+" Élément de configuration : <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -348,15 +317,13 @@ msgstr ""
msgid ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
" <listitem><para>File fragments for the version preferences.\n"
-" Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para>"
-"</listitem>\n"
+" Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
" <listitem><para>Fragments de fichiers pour la préférence des versions.\n"
-" Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>"
-".</para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -367,35 +334,28 @@ msgid ""
"<!ENTITY file-sourceslist \"\n"
" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
" <listitem><para>Locations to fetch packages from.\n"
-" Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-sourceslist \"\n"
" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
" <listitem><para>Emplacement pour la récupération des paquets.\n"
-" Élément de configuration : <literal>Dir::Etc::SourceList</literal>.<"
-"/para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
#: apt.ent:137
#, no-wrap
msgid ""
-" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
-"\n"
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
" <listitem><para>File fragments for locations to fetch packages from.\n"
-" Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
-" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
-"\n"
-" <listitem><para>Fragments de fichiers définissant les emplacements de "
-"récupération de paquets.\n"
-" Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.<"
-"/para></listitem>\n"
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>Fragments de fichiers définissant les emplacements de récupération de paquets.\n"
+" Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -405,38 +365,30 @@ msgstr ""
msgid ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-" <listitem><para>Storage area for state information for each package "
-"resource specified in\n"
+" <listitem><para>Storage area for state information for each package resource specified in\n"
" &sources-list;\n"
-" Configuration Item: <literal>Dir::State::Lists</literal>.</para><"
-"/listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-" <listitem><para>Zone de stockage pour les informations qui concernent "
-"chaque ressource de paquet spécifiée dans &sources-list;\n"
-" Élément de configuration : <literal>Dir::State::Lists</literal>.</para><"
-"/listitem>\n"
+" <listitem><para>Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n"
+" Élément de configuration : <literal>Dir::State::Lists</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
#: apt.ent:150
#, no-wrap
msgid ""
-" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
-"\n"
+" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>"
-"partial</filename> will be implicitly appended)</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
-" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
-"\n"
+" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Zone de stockage pour les informations en transit.\n"
-" Élément de configuration : <literal>Dir::State::Lists</literal> (<"
-"filename>partial</filename> sera implicitement ajouté).</para></listitem>\n"
+" Élément de configuration : <literal>Dir::State::Lists</literal> (<filename>partial</filename> sera implicitement ajouté).</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -446,18 +398,14 @@ msgstr ""
msgid ""
"<!ENTITY file-trustedgpg \"\n"
" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-" <listitem><para>Keyring of local trusted keys, new keys will be added "
-"here.\n"
-" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para><"
-"/listitem>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
"<!ENTITY file-trustedgpg \"\n"
" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-" <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles "
-"clés y seront ajoutées.\n"
-" Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para><"
-"/listitem>\n"
+" <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n"
+" Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -465,21 +413,16 @@ msgstr ""
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-" <listitem><para>File fragments for the trusted keys, additional keyrings "
-"can\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
" be stored here (by other packages or the administrator).\n"
-" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para><"
-"/listitem>\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-" <listitem><para>Fragments de fichiers pour les clés de signatures sûres. "
-"Des fichiers\n"
-" supplémentaires peuvent être placés à cet endroit (par des paquets ou "
-"par l'administrateur).\n"
-" Élément de configuration : <literal>Dir::Etc::TrustedParts</literal>.<"
-"/para></listitem>\n"
+" <listitem><para>Fragments de fichiers pour les clés de signatures sûres. Des fichiers\n"
+" supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n"
+" Élément de configuration : <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -488,8 +431,7 @@ msgstr ""
#, no-wrap
msgid ""
"<!ENTITY file-extended_states \"\n"
-" <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
-"/term>\n"
+" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
" <listitem><para>Status list of auto-installed packages.\n"
" Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
" </para></listitem>\n"
@@ -497,11 +439,9 @@ msgid ""
"\">\n"
msgstr ""
"<!ENTITY file-extended_states \"\n"
-" <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
-"/term>\n"
+" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
" <listitem><para>Liste d'état des paquets installés automatiquement.\n"
-" Élément de configuration : <literal>Dir::State::extended_states</literal>"
-".</para></listitem>\n"
+" Élément de configuration : <literal>Dir::State::extended_states</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -509,10 +449,8 @@ msgstr ""
#: apt.ent:175
#, no-wrap
msgid ""
-"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
-"comparable\n"
-" to the other headers like NAME and DESCRIPTION and should therefore be "
-"uppercase. -->\n"
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+" to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
"<!ENTITY translation-title \"TRANSLATION\">\n"
msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
@@ -520,39 +458,28 @@ msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
#: apt.ent:184
#, no-wrap
msgid ""
-"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
-"contributed\n"
-" to the translation in the past, who is responsible now and maybe further "
-"information\n"
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
" specially related to your translation. -->\n"
"<!ENTITY translation-holder \"\n"
-" The english translation was done by John Doe <email>john@doe.org</email> "
-"in 2009,\n"
-" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together "
-"with the\n"
-" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>"
-".\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
"\">\n"
msgstr ""
"<!ENTITY translation-holder \"\n"
-" Jérôme Marant, Philippe Batailler, Christian Perrier <email>"
-"bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
-" Équipe de traduction francophone de Debian <email>"
-"debian-l10n-french@lists.debian.org</email>\n"
+" Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
+" Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>\n"
"\">\n"
#. type: Plain text
#: apt.ent:195
#, no-wrap
msgid ""
-"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
-"untranslated/fuzzy strings\n"
-" in a shipped manpage newer/modified paragraphs will maybe appear in "
-"english in\n"
-" the generated manpage. This sentence is therefore here to tell the "
-"reader that this\n"
-" is not a mistake by the translator - obviously the target is that at "
-"least for stable\n"
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
+" the generated manpage. This sentence is therefore here to tell the reader that this\n"
+" is not a mistake by the translator - obviously the target is that at least for stable\n"
" releases this sentence is not needed. :) -->\n"
"<!ENTITY translation-english \"\n"
" Note that this translated document may contain untranslated parts.\n"
@@ -561,8 +488,7 @@ msgid ""
"\">\n"
msgstr ""
"<!ENTITY translation-english \"\n"
-" Veuillez noter que cette traduction peut contenir des parties non "
-"traduites.\n"
+" Veuillez noter que cette traduction peut contenir des parties non traduites.\n"
" Cela est volontaire, pour éviter de perdre du contenu quand la\n"
" traduction est légèrement en retard sur le contenu d'origine.\n"
"\">\n"
@@ -2331,12 +2257,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Mettre à jour le trousseau de clés local avec le trousseau de clés de "
"l'archive et y supprimer les clés qui ne sont plus valables. Le trousseau de "
@@ -2405,24 +2338,33 @@ msgstr "Base de données locale de fiabilité des clés de l'archive."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Trousseau des clés fiables de l'archive Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
#. type: Content of: <refentry><refsect1><para>
@@ -4124,12 +4066,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
#: apt.conf.5.xml:497
#, no-wrap
-msgid ""
-"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<"
-"replaceable>Methodname</replaceable>\";"
-msgstr ""
-"Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<"
-"replaceable>NomMethode</replaceable>\";"
+msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
+msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:492
@@ -4278,10 +4216,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
#: apt.conf.5.xml:549
#, no-wrap
-msgid ""
-"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr ""
-"Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
+msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:537
@@ -4915,7 +4851,7 @@ msgstr ""
#. TODO: provide a
#. motivating example, except I haven't a clue why you'd want
-#. to do this.
+#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.conf.5.xml:836
msgid ""
@@ -5198,7 +5134,7 @@ msgstr ""
"Le fichier &configureindex; contient un modèle de fichier montrant des "
"exemples pour toutes les options existantes."
-#. ? reading apt.conf
+#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1175
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -5311,12 +5247,8 @@ msgstr "Priorités affectées par défaut"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:94
#, no-wrap
-msgid ""
-"<command>apt-get install -t testing <replaceable>some-package</replaceable><"
-"/command>\n"
-msgstr ""
-"<command>apt-get install -t testing <replaceable>paquet</replaceable><"
-"/command>\n"
+msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
+msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:97
@@ -6463,10 +6395,8 @@ msgstr "Suivre l'évolution d'une version par son nom de code"
#: apt_preferences.5.xml:654
#, no-wrap
msgid ""
-"Explanation: Uninstall or do not install any Debian-originated package "
-"versions\n"
-"Explanation: other than those in the distribution codenamed with "
-"&testing-codename; or sid\n"
+"Explanation: Uninstall or do not install any Debian-originated package versions\n"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
"Package: *\n"
"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
@@ -6814,13 +6744,11 @@ msgstr "Exemples :"
#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib "
-"non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
msgstr ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib "
-"non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
#. type: Content of: <refentry><refsect1><title>
@@ -8140,12 +8068,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
#: apt-ftparchive.1.xml:602
#, no-wrap
-msgid ""
-"<command>apt-ftparchive</command> packages <replaceable>directory<"
-"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr ""
-"<command>apt-ftparchive</command> packages <replaceable>répertoire<"
-"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml:598
@@ -8524,8 +8448,7 @@ msgid ""
"Building Dependency Tree... Done"
msgstr ""
"# apt-get update\n"
-"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ "
-"Packages\n"
+"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
"Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
"Lecture des listes de paquets... Fait\n"
"Construction de l'arbre des dépendances... Fait"
@@ -9245,11 +9168,9 @@ msgid ""
"12 packages not fully installed or removed.\n"
"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
msgstr ""
-"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis "
-"à jour.\n"
+"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
"12 paquets partiellement installés ou enlevés.\n"
-"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette "
-"opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
#. type: <p></p>
#: guide.sgml:470
@@ -9319,12 +9240,10 @@ msgid ""
"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
msgstr ""
"# apt-get update\n"
-"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ "
-"Packages\n"
+"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
"Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
"Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
-"Packages\n"
+"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
"Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s"
@@ -9690,8 +9609,7 @@ msgstr ""
" # apt-get update\n"
" [ APT récupère les fichiers des paquets ]\n"
" # apt-get dist-upgrade\n"
-" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine "
-"distante ]"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]"
#. type: </example></p>
#: offline.sgml:149
@@ -9812,8 +9730,7 @@ msgid ""
" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
msgstr ""
" # apt-get dist-upgrade \n"
-" [ Répondre négativement à la question, pour être sûr(e) que les actions vous "
-"conviennent ]\n"
+" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
" # apt-get -qq --print-uris dist-upgrade > uris\n"
" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
diff --git a/doc/po/it.po b/doc/po/it.po
index 230f85b07..59a54917e 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-12-23 18:04+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -2296,12 +2296,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Aggiorna il portachiavi locale con il portachiavi dell'archivio e rimuove "
"dal portachiavi locale le chiavi di archivio che non sono più valide. Il "
@@ -2370,24 +2377,33 @@ msgstr "Database locale di fiducia delle chiavi archiviate."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Portachiavi delle chiavi fidate degli archivi Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Portachiavi delle chiavi fidate rimosse degli archivi Debian."
#. type: Content of: <refentry><refsect1><para>
@@ -10126,7 +10142,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
#~ " <contrib></contrib>\n"
#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
+#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+#~ "copyright>\n"
#~ " <date>28 October 2008</date>\n"
#~ " <productname>Linux</productname>\n"
#~ msgstr ""
@@ -10138,7 +10155,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
#~ " <contrib></contrib>\n"
#~ " </author>\n"
-#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
+#~ " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+#~ "copyright>\n"
#~ " <date>28 ottobre 2008</date>\n"
#~ " <productname>Linux</productname>\n"
@@ -10224,7 +10242,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "<!-- Boiler plate Bug reporting section -->\n"
#~ "<!ENTITY manbugs \"\n"
#~ " <refsect1><title>Bugs</title>\n"
-#~ " <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>. \n"
+#~ " <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</"
+#~ "ulink>. \n"
#~ " If you wish to report a bug in APT, please see\n"
#~ " <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the\n"
#~ " &reportbug; command.\n"
@@ -10235,7 +10254,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "<!-- Sezione standard segnalazione bachi -->\n"
#~ "<!ENTITY manbugs \"\n"
#~ " <refsect1><title>Bachi</title>\n"
-#~ " <para><ulink url='http://bugs.debian.org/src:apt'>Pagina dei bachi di APT</ulink>. \n"
+#~ " <para><ulink url='http://bugs.debian.org/src:apt'>Pagina dei bachi di "
+#~ "APT</ulink>. \n"
#~ " Per segnalare un baco in APT, vedere\n"
#~ " <filename>/usr/share/doc/debian/bug-reporting.txt</filename> o il\n"
#~ " comando &reportbug;.\n"
@@ -10247,7 +10267,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <varlistentry>\n"
#~ " <term><option>-c</option></term>\n"
#~ " <term><option>--config-file</option></term>\n"
-#~ " <listitem><para>Configuration File; Specify a configuration file to use. \n"
+#~ " <listitem><para>Configuration File; Specify a configuration file to "
+#~ "use. \n"
#~ " The program will read the default configuration file and then this \n"
#~ " configuration file. See &apt-conf; for syntax information. \n"
#~ " </para>\n"
@@ -10257,36 +10278,49 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " <varlistentry>\n"
#~ " <term><option>-c</option></term>\n"
#~ " <term><option>--config-file</option></term>\n"
-#~ " <listitem><para>File di configurazione; Specifica un file di configurazione da usare. \n"
-#~ " Il programma leggerà il file di configurazione predefinito e poi questo \n"
-#~ " file di configurazione. Vedere &apt-conf; per informazioni sulla sintassi. \n"
+#~ " <listitem><para>File di configurazione; Specifica un file di "
+#~ "configurazione da usare. \n"
+#~ " Il programma leggerà il file di configurazione predefinito e poi "
+#~ "questo \n"
+#~ " file di configurazione. Vedere &apt-conf; per informazioni sulla "
+#~ "sintassi. \n"
#~ " </para>\n"
#~ " </listitem>\n"
#~ " </varlistentry>\n"
#~ msgid ""
-#~ " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+#~ " <varlistentry><term><filename>&cachedir;/archives/partial/</"
+#~ "filename></term>\n"
#~ " <listitem><para>Storage area for package files in transit.\n"
-#~ " Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+#~ " Configuration Item: <literal>Dir::Cache::Archives</literal> "
+#~ "(implicit partial). </para></listitem>\n"
#~ " </varlistentry>\n"
#~ "\">\n"
#~ msgstr ""
-#~ " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
-#~ " <listitem><para>Area di memorizzazione per i file dei pacchetti in transito.\n"
-#~ " Voce di configurazione: <literal>Dir::Cache::Archives</literal> (partial implicito). </para></listitem>\n"
+#~ " <varlistentry><term><filename>&cachedir;/archives/partial/</"
+#~ "filename></term>\n"
+#~ " <listitem><para>Area di memorizzazione per i file dei pacchetti in "
+#~ "transito.\n"
+#~ " Voce di configurazione: <literal>Dir::Cache::Archives</literal> "
+#~ "(partial implicito). </para></listitem>\n"
#~ " </varlistentry>\n"
#~ "\">\n"
#~ msgid ""
-#~ " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+#~ " <varlistentry><term><filename>&statedir;/lists/partial/</filename></"
+#~ "term>\n"
#~ " <listitem><para>Storage area for state information in transit.\n"
-#~ " Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+#~ " Configuration Item: <literal>Dir::State::Lists</literal> (implicit "
+#~ "partial).</para></listitem>\n"
#~ " </varlistentry>\n"
#~ "\">\n"
#~ msgstr ""
-#~ " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
-#~ " <listitem><para>Area di archiviazione per le informazioni di stato in transito.\n"
-#~ " Voce di configurazione: <literal>Dir::State::Lists</literal> (partial implicito).</para></listitem>\n"
+#~ " <varlistentry><term><filename>&statedir;/lists/partial/</filename></"
+#~ "term>\n"
+#~ " <listitem><para>Area di archiviazione per le informazioni di stato "
+#~ "in transito.\n"
+#~ " Voce di configurazione: <literal>Dir::State::Lists</literal> "
+#~ "(partial implicito).</para></listitem>\n"
#~ " </varlistentry>\n"
#~ "\">\n"
@@ -10294,17 +10328,24 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ msgstr "<!ENTITY translation-title \"TRANSLATION\">"
#~ msgid ""
-#~ "<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
-#~ " to the translation in the past, who is responsible now and maybe further information\n"
+#~ "<!-- TRANSLATOR: This is a placeholder. You should write here who has "
+#~ "constributed\n"
+#~ " to the translation in the past, who is responsible now and maybe "
+#~ "further information\n"
#~ " specially related to your translation. -->\n"
#~ "<!ENTITY translation-holder \"\n"
-#~ " The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
-#~ " 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
-#~ " Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+#~ " The english translation was done by John Doe <email>john@doe.org</"
+#~ "email> in 2009,\n"
+#~ " 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 "
+#~ "together with the\n"
+#~ " Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</"
+#~ "email>.\n"
#~ "\">\n"
#~ msgstr ""
-#~ "<!-- TRADUTTORE: questo è un segnaposto. Qui bisogna scrivere chi ha contribuito\n"
-#~ " alla traduzione in passato, l'attuale responsabile e nel caso ulteriori informazioni\n"
+#~ "<!-- TRADUTTORE: questo è un segnaposto. Qui bisogna scrivere chi ha "
+#~ "contribuito\n"
+#~ " alla traduzione in passato, l'attuale responsabile e nel caso "
+#~ "ulteriori informazioni\n"
#~ " riguardanti in modo particolare questa traduzione. -->\n"
#~ "<!ENTITY translation-holder \"\n"
#~ " La traduzione italiana è stata fatta da Eugenia Franzoni\n"
@@ -10314,7 +10355,8 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "\">\n"
#~ msgid ""
-#~ "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+#~ "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/"
+#~ "fuzzy strings\n"
#~ " in a shipped manpage will maybe appear english parts. -->\n"
#~ "<!ENTITY translation-english \"\n"
#~ " Note that this translated document may contain untranslated parts.\n"
@@ -10322,11 +10364,14 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ " translation is lagging behind the original content.\n"
#~ "\">\n"
#~ msgstr ""
-#~ "<!-- TRADUTTORE: poiché una traduzione può avere il 20% di stringhe non tradotte/fuzzy\n"
-#~ " in una manpage fornita è possibile che compaiano parti in inglese. -->\n"
+#~ "<!-- TRADUTTORE: poiché una traduzione può avere il 20% di stringhe non "
+#~ "tradotte/fuzzy\n"
+#~ " in una manpage fornita è possibile che compaiano parti in inglese. --"
+#~ ">\n"
#~ "<!ENTITY translation-english \"\n"
#~ " Questo documento tradotto può contenere parti non tradotte.\n"
-#~ " Ciò è fatto di proposito, per evitare di perdere contenuti quando la\n"
+#~ " Ciò è fatto di proposito, per evitare di perdere contenuti quando "
+#~ "la\n"
#~ " traduzione è più vecchia del contenuto originale.\n"
#~ "\">\n"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 1c8f4cdef..cb2ae7f48 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-08-08 07:58+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -2215,12 +2215,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ"
"イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の"
@@ -2287,24 +2294,33 @@ msgstr "アーカイブキーのローカル信頼データベースです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 9be82667e..4388534f8 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-07-28 21:59+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -2362,12 +2362,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum i "
"usuwa z lokalnej składnicy niepoprawne klucze archiwum. Składnica kluczy "
@@ -2436,24 +2443,33 @@ msgstr "Lokalna składnica zaufanych kluczy archiwum."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Składnica zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 6beff2223..314b5771b 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2012-09-03 01:53+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
"Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -2276,12 +2276,19 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:130
+#, fuzzy
+#| msgid ""
+#| "Update the local keyring with the archive keyring and remove from the "
+#| "local keyring the archive keys which are no longer valid. The archive "
+#| "keyring is shipped in the <literal>archive-keyring</literal> package of "
+#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> "
+#| "package in Debian."
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
"Actualiza o chaveiro local com o chaveiro do arquivo e remove do chaveiro "
"local as chaves de arquivo que já não são válidas. O chaveiro do arquivo é "
@@ -2349,24 +2356,33 @@ msgstr "Base de dados local de confiança de chaves de arquivos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+#, fuzzy
+#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
+#, fuzzy
+#| msgid ""
+#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+#, fuzzy
+#| msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
#. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 2f73e3d49..d2f597a6a 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-02 15:13+0300\n"
+"POT-Creation-Date: 2013-04-30 10:29+0300\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1618,8 +1618,8 @@ msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1669,23 +1669,23 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:187
msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index 760c20120..af8ec3a8f 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -34,7 +34,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
if (F == 0)
return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
- char Line[500];
+ char Line[1000];
unsigned long long Counter = 0;
while (fgets(Line,sizeof(Line),F) != 0)
{
@@ -142,7 +142,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
if (F == 0)
return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
- char Line[500];
+ char Line[1000];
unsigned long long Counter = 0;
while (fgets(Line,sizeof(Line),F) != 0)
{
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 763d8a034..f0c430fef 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.9.7.9~exp2\n"
+"Project-Id-Version: apt 0.9.7.7ubuntu3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+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"
@@ -152,7 +152,7 @@ msgid " Version table:"
msgstr ""
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -569,7 +569,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -743,7 +743,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr ""
@@ -923,11 +923,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -973,7 +973,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1041,8 +1041,7 @@ msgid "%s was already not hold.\n"
msgstr ""
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1176,8 +1175,8 @@ msgstr ""
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr ""
@@ -1190,8 +1189,8 @@ msgid "Protocol corruption"
msgstr ""
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr ""
@@ -1245,7 +1244,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr ""
@@ -1272,90 +1271,85 @@ msgstr ""
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr ""
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr ""
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr ""
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s'"
-msgstr ""
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr ""
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1393,53 +1387,53 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr ""
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1546,7 +1540,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -1651,8 +1645,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr ""
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr ""
@@ -1665,87 +1659,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -1819,7 +1813,7 @@ msgstr ""
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr ""
@@ -1943,54 +1937,54 @@ msgstr ""
msgid "Failed to close file %s"
msgstr ""
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr ""
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr ""
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr ""
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr ""
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr ""
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr ""
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr ""
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr ""
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr ""
@@ -2066,30 +2060,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2159,16 +2153,6 @@ msgstr ""
msgid "%c%s... Done"
msgstr ""
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr ""
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2280,69 +2264,63 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr ""
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr ""
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2368,59 +2346,59 @@ msgstr ""
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr ""
@@ -2520,12 +2498,12 @@ msgstr ""
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
@@ -2561,17 +2539,17 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2619,12 +2597,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2677,14 +2655,14 @@ msgstr ""
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr ""
@@ -2705,26 +2683,26 @@ msgstr ""
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr ""
@@ -2737,97 +2715,97 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, 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:1700
+#: apt-pkg/acquire-item.cc:1705
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
@@ -2919,22 +2897,22 @@ msgstr ""
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2949,6 +2927,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr ""
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr ""
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3012,119 +3001,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3136,7 +3125,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index ffb394131..02c37bc81 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " جدول النسخ:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -582,7 +582,7 @@ msgstr "إجهاض."
msgid "Do you want to continue [Y/n]? "
msgstr "هل تريد الاستمرار [Y/n]؟"
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "فشل إحضار %s %s\n"
@@ -761,7 +761,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "حساب الترقية..."
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "فشل"
@@ -941,11 +941,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr "الاتصال بـ%s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "الوحدات المدعومة:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -991,7 +991,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1062,8 +1062,7 @@ msgid "%s was already not hold.\n"
msgstr "%s هي النسخة الأحدث.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1201,8 +1200,8 @@ msgstr "انتهى وقت الاتصال"
msgid "Server closed the connection"
msgstr "أغلق الخادم الاتصال"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "خطأ في القراءة"
@@ -1215,8 +1214,8 @@ msgid "Protocol corruption"
msgstr ""
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "خطأ في الكتابة"
@@ -1270,7 +1269,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr "تعذر قبول الاتصال"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr ""
@@ -1297,90 +1296,85 @@ msgstr "استعلام"
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "الاتصال بـ%s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "تعذر الاتصال بـ%s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "الاتصال بـ%s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s'"
-msgstr ""
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "تعذر الاتصال بـ%s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1418,53 +1412,53 @@ msgstr "خادم http له دعم مدى معطوب"
msgid "Unknown date format"
msgstr "نسق تاريخ مجهول"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "فشل التحديد"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "انتهى وقت الاتصال"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "خطأ في الكتابة إلى ملف المُخرجات"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "خطأ في الكتابة إلى الملف"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "خطأ في الكتابة إلى الملف"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "خطأ في القراءة من الخادم"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "بيانات ترويسة سيئة"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "فشل الاتصال"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "خطأ داخلي"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "تعذرت قراءة %s"
@@ -1573,7 +1567,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "تعذرت الكتابة إلى %s"
@@ -1678,8 +1672,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr ""
@@ -1692,87 +1686,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: تعذرت قراءة الدليل %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "فشل فتح %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** فشل ربط %s بـ%s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -1846,7 +1840,7 @@ msgstr ""
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "فشل تغيير اسم %s إلى %s"
@@ -1970,54 +1964,54 @@ msgstr "فشلت كتابة الملف %s"
msgid "Failed to close file %s"
msgstr "فشل إغلاق الملف %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "المسار %s طويل جداً"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "فكّ تحزيم %s أكثر من مرّة"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr ""
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr ""
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr ""
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr ""
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "المسار طويل جداً"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr ""
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr ""
@@ -2096,30 +2090,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "تعذر العثور على التحديد %s"
@@ -2189,16 +2183,6 @@ msgstr "%c%s... خطأ!"
msgid "%c%s... Done"
msgstr "%c%s... تمّ"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... تمّ"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2310,69 +2294,63 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "فشل إغلاق الملف %s"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "مشكلة في إغلاق الملف"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "مشكلة في مزامنة الملف"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "مشكلة في إغلاق الملف"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "مشكلة في مزامنة الملف"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "إجهاض التثبيت."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2398,59 +2376,59 @@ msgstr ""
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "يعتمد"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "يعتمد مسبقاً"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "يستحسن"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "يقترح"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "يعارض"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "يستبدل"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "يُلغي"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "مهم"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "مطلوب"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "قياسي"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "اختياري"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "إضافي"
@@ -2551,12 +2529,12 @@ msgstr "فتح %s"
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
@@ -2592,17 +2570,17 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2650,12 +2628,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "نظام الحزم '%s' غير مدعوم"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2708,14 +2686,14 @@ msgstr ""
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
@@ -2736,26 +2714,26 @@ msgstr ""
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "قراءة قوائم الحزم"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr ""
@@ -2768,98 +2746,98 @@ msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, 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:1700
+#: apt-pkg/acquire-item.cc:1705
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "الحجم غير متطابق"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
@@ -2954,22 +2932,22 @@ msgstr "كتابة لائحة المصادر الجديدة\n"
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2984,6 +2962,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum غير متطابقة"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "إجهاض التثبيت."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3047,119 +3036,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "تم تثبيت %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "تهيئة %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "إزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "تمت إزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "فشل إغلاق الملف %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "تحضير %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "فتح %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "التحضير لتهيئة %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "تم تثبيت %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "التحضير لإزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "تم إزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "التحضير لإزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "تمت إزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3171,7 +3160,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3201,6 +3196,10 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... تمّ"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "فتح ملف التهيئة %s"
diff --git a/po/ast.po b/po/ast.po
index b3c87bd06..7a7b7d37f 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -152,7 +152,7 @@ msgid " Version table:"
msgstr " Tabla de versiones:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -628,7 +628,7 @@ msgstr "Encaboxar."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Quies continuar [S/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falló algamar %s %s\n"
@@ -820,7 +820,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Calculando l'anovamientu... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Falló"
@@ -844,7 +844,7 @@ msgstr ""
#: cmdline/apt-get.cc:2393
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "Descargando %s %s"
#: cmdline/apt-get.cc:2453
msgid "Must specify at least one package to fetch source for"
@@ -1018,11 +1018,11 @@ msgstr "Fallu al procesar les dependencies de construcción"
msgid "Changelog for %s (%s)"
msgstr "Coneutando a %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Módulos sofitaos:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1113,7 +1113,7 @@ msgstr ""
"pa más información y opciones.\n"
" Esti APT tien Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1189,8 +1189,7 @@ msgid "%s was already not hold.\n"
msgstr "%s yá ta na versión más nueva.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero nun taba ellí"
@@ -1328,8 +1327,8 @@ msgstr "Gandió'l tiempu de conexón"
msgid "Server closed the connection"
msgstr "El sirvidor zarró la conexón"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Fallu de llectura"
@@ -1342,8 +1341,8 @@ msgid "Protocol corruption"
msgstr "Corrupción del protocolu"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Fallu d'escritura"
@@ -1397,7 +1396,7 @@ msgstr "Gandió'l tiempu de conexón col zócalu de datos"
msgid "Unable to accept connection"
msgstr "Nun se pudo aceptar la conexón"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Hebo un problema al xenerar el hash del ficheru"
@@ -1424,91 +1423,86 @@ msgstr "Consulta"
msgid "Unable to invoke "
msgstr "Nun se pudo invocar "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Coneutando a %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nun se pudo coneutar a %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nun se pudo coneutar a %s:%s (%s); expiró'l tiempu de conexón"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nun se pudo coneutar a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Coneutando a %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nun se pudo resolver '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Fallu temporal al resolver '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nun pudo coneutase a %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Atopóse polo menos una robla mala."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Nun pudo executase 'gpgv' pa verificar la robla (¿ta instaláu gpgv?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Fallu desconocíu al executar gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Les siguientes robles nun valieron:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1548,53 +1542,53 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
msgid "Unknown date format"
msgstr "Formatu de data desconocíu"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Falló la escoyeta"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Gandió'l tiempu de conexón"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Fallu al escribir nel ficheru de salida"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Fallu al escribir nel ficheru"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Fallu al escribir nel ficheru"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón."
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Fallu al lleer nel sirvidor"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Datos de testera incorreutos"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Fallo la conexón"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Fallu internu"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Nun ye a lleer %s"
@@ -1721,7 +1715,7 @@ msgstr ""
"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Nun se pue escribir en %s"
@@ -1867,8 +1861,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Nun pudo lleese %s"
@@ -1881,87 +1875,87 @@ msgstr "L'archivu nun tien rexistru de control"
msgid "Unable to get a cursor"
msgstr "Nun pudo algamase un cursor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Nun pudo lleese'l direutoriu %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Nun pudo lleese %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Errores aplicables al ficheru "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Nun pudo resolvese %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Falló'l percorríu pol árbol"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Nun pudo abrise %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Desenllazar %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Nun pudo lleese l'enllaz %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Nun pudo desenllazase %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falló enllazar enllazr %s a %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "L'archivu nun tien el campu paquetes"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nun tien la entrada saltos\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el curiador de %s ye %s y non %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nun tien la entrada saltos de fonte\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco nun tiene una entrada binaria de saltos\n"
@@ -2035,7 +2029,7 @@ msgstr "Nun pudo lleese al computar MD5"
msgid "Problem unlinking %s"
msgstr "Problema al desenllazar %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Nun pudo renomase %s como %s"
@@ -2182,54 +2176,54 @@ msgstr "Falló la escritura nel ficheru %s"
msgid "Failed to close file %s"
msgstr "Falló al pesllar el ficheru %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "La trayeutoria %s ye enforma llarga"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Desempaquetando %s más d'una vegada"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "El direutorio %s ta desviáu"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "El paquete ta tentando escribir nel oxetivu desviáu %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "La trayeutoria de desviación ye enforma llarga"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "El direutoriu %s ta reemplazándose por un non-direutoriu"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Fallu al atopar el nodu nel so bote d'enllaz"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "La trayeutoria ye perllarga"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Sobreescribiendo concordancia del paquete ensin versión pa %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Nun ye a lleer %s"
@@ -2310,30 +2304,30 @@ msgstr ""
"desactivao pol usuariu."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Escoyeta %s que nun s'atopa"
@@ -2406,16 +2400,6 @@ msgstr "%c%s... ¡Fallu!"
msgid "%c%s... Done"
msgstr "%c%s... Fecho"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Fecho"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2527,69 +2511,63 @@ msgstr "El subprocesu %s recibió un fallu de segmentación."
msgid "Sub-process %s received signal %u."
msgstr "El subprocesu %s recibió una señal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El subprocesu %s devolvió un códigu d'error (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subprocesu %s terminó de manera inesperada"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Nun se pudo abrir el ficheru %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Nun pudo abrise un ficheru descriptor %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Nun pudo criase'l soprocesu IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Nun pudo executase'l compresor "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problemes zarrando'l ficheru %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Hai problemes al renomar el ficheru %s a %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Hai problemes desvenceyando'l ficheru %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Hai problemes al sincronizar el ficheru"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "L'aniellu de claves nun s'instaló en %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Caché de paquetes balera."
@@ -2616,59 +2594,59 @@ msgstr "Esti APT nun soporta'l sistema de versiones '%s'"
msgid "The package cache was built for a different architecture"
msgstr "La caché de paquetes creóse pa una arquitectura estremada"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Depende de"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Predepende de"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Suxer"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Recomienda"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "En conflictu con"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Sustituye a"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Fai obsoletu a"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Ruempe"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Aumenta"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "requeríu"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "estándar"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2771,12 +2749,12 @@ msgstr "Abriendo %s"
msgid "Line %u too long in source list %s."
msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
@@ -2818,7 +2796,7 @@ msgid ""
msgstr ""
"El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2826,11 +2804,11 @@ msgstr ""
"Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola "
"mor de paquetes reteníos."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2881,12 +2859,12 @@ msgstr "El métodu %s nun entamó correchamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema d'empaquetáu '%s' nun ta sofitáu"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nun pudo determinase una triba de sistema d'empaquetáu afayadiza"
@@ -2941,14 +2919,14 @@ msgstr "La caché tien un sistema de versiones incompatible"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Hebo un error al procesar %s (FindPkg)"
@@ -2970,26 +2948,26 @@ msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Al procesar dependencies de ficheros nun s'alcontró el paquete %s %s"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Lleendo llista de paquetes"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Recoyendo ficheros qu'apurren"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Fallu de E/S al grabar caché d'oríxenes"
@@ -3002,55 +2980,55 @@ msgstr "falló'l cambiu de nome, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "La suma MD5 nun concasa"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "La suma hash nun concasa"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Hebo un fallu durante la verificación de la robla. El repositoriu nun ta "
"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Fallu GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3059,7 +3037,7 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3068,7 +3046,7 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete"
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3076,31 +3054,31 @@ msgstr ""
"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
"paquete %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "El tamañu nun concasa"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Ensin seiciones nel ficheru release %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ensin entrada Hash nel ficheru release %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
@@ -3200,22 +3178,22 @@ msgstr "Escribiendo llista nueva d'oríxenes\n"
msgid "Source list entries for this disc are:\n"
msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i rexistros escritos.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i rexistros escritos con %i ficheros de menos.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3232,6 +3210,17 @@ msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
msgid "Hash mismatch for: %s"
msgstr "El hash nun concasa pa: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "L'aniellu de claves nun s'instaló en %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3303,115 +3292,115 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Desinstalando %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Desinstalóse dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Anotando desaniciáu de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Executando activador de post-instalación de %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta'l direutoriu '%s'."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Nun pudo abrise'l ficheru '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparándose pa configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s instaláu"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparándose pa desinstalar %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s desinstaláu"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparándose pa desinstalar dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Desinstalóse dafechu %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nun puede escribise nel rexistru, falló openpty() (¿/dev/pts nun ta "
"montáu?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Executando dpkt"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "problemes de dependencies - déxase ensin configurar"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3419,7 +3408,7 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que "
"siguió dende un fallu previu"
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3435,7 +3424,13 @@ msgstr ""
"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
"memoria"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3470,6 +3465,21 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloquiáu"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Fecho"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Hebo un fallu durante la verificación de la robla. El repositoriu nun ta "
+#~ "anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Saltando'l ficheru non esistente %s"
diff --git a/po/bg.po b/po/bg.po
index 0768e88e7..55e29d566 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-06-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Таблица с версиите:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -638,7 +638,7 @@ msgstr "Прекъсване."
msgid "Do you want to continue [Y/n]? "
msgstr "Искате ли да продължите [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
@@ -831,7 +831,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Неуспех"
@@ -1033,11 +1033,11 @@ msgstr "Неуспех при обработката на зависимости
msgid "Changelog for %s (%s)"
msgstr "Журнал на промените в %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1127,7 +1127,7 @@ msgstr ""
"информация и опции.\n"
" Това APT има Върховни Сили.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1202,8 +1202,7 @@ msgid "%s was already not hold.\n"
msgstr "Пакетът „%s“ вече е задържан.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Изчака се завършването на %s, но той не беше пуснат"
@@ -1360,8 +1359,8 @@ msgstr "Допустимото време за свързването изтеч
msgid "Server closed the connection"
msgstr "Сървърът разпадна връзката"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Грешка при четене"
@@ -1374,8 +1373,8 @@ msgid "Protocol corruption"
msgstr "Развален протокол"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Грешка при запис"
@@ -1431,7 +1430,7 @@ msgstr "Времето за установяване на връзка с гне
msgid "Unable to accept connection"
msgstr "Невъзможно е да се приеме свързването"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Проблем при хеширане на файла"
@@ -1458,94 +1457,89 @@ msgstr "Запитване"
msgid "Unable to invoke "
msgstr "Неуспех при извикването на "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Свързване с %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Не може да се започне свързване с %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Неуспех при свързване с %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Свързване с %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Неуспех при намирането на IP адреса на „%s“"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Временен неуспех при намирането на IP адреса на „%s“"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Неуспех при свързване с %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
"ключа?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Намерен е поне един невалиден подпис."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е "
"gpgv?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Неизвестна грешка при изпълнението на gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Следните подписи са невалидни:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1585,53 +1579,53 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл
msgid "Unknown date format"
msgstr "Неизвестен формат на дата"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Неуспех на избора"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Допустимото време за свързване изтече"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Грешка при записа на изходен файл"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Грешка при записа на файл"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Грешка при записа на файла"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Грешка при четене от сървъра"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Невалидни данни на заглавната част"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Неуспех при свързването"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Вътрешна грешка"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Неуспех при четенето на %s"
@@ -1756,7 +1750,7 @@ msgstr ""
" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Неуспех при записа на %s"
@@ -1906,8 +1900,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Неуспех при отварянето на файл %s от БД: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Грешка при получаването на атрибути за %s"
@@ -1920,87 +1914,87 @@ msgstr "В архива няма поле „control“"
msgid "Unable to get a cursor"
msgstr "Неуспех при получаването на курсор"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Неуспех при четенето на директория %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Неуспех при четенето на %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Грешките се отнасят за файла "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Неуспех при превръщането на %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Неуспех при обхода на дървото"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Неуспех при отварянето на %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Неуспех при прочитането на връзка %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Неуспех при премахването на връзка %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Неуспех при създаването на връзка %s към %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "Превишен лимит на DeLink от %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Архивът няма поле „package“"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s няма запис „override“\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " поддържащия пакета %s е %s, а не %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s няма запис „source override“\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s няма също и запис „binary override“\n"
@@ -2074,7 +2068,7 @@ msgstr "Неуспех при четене докато се изчислява
msgid "Problem unlinking %s"
msgstr "Неуспех при премахването на връзка на %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Неуспех при преименуването на %s на %s"
@@ -2219,54 +2213,54 @@ msgstr "Неуспех при запис на файл %s"
msgid "Failed to close file %s"
msgstr "Неуспех при затварянето на файл %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Пътят %s е твърде дълъг"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Разпакетиране на %s повече от веднъж"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Директорията %s е отклонена"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Пътят за отклонение е твърде дълъг"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Директорията %s се заменя с не-директория"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Неуспех при намирането на възел в неговия хеш"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Пътят е твърде дълъг"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Файловете се заменят със съдържанието на пакета %s без версия"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Файл %s/%s заменя този в пакет %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Неуспех при получаването на атрибути за %s"
@@ -2348,30 +2342,30 @@ msgstr ""
"забранено от потребителя."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liд %liч %liм %liс"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%liч %liм %liс"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%liм %liс"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Изборът %s не е намерен"
@@ -2444,16 +2438,6 @@ msgstr "%c%s... Грешка!"
msgid "%c%s... Done"
msgstr "%c%s... Готово"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Готово"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2568,70 +2552,64 @@ msgstr "Нарушение на защитата на паметта (segmentati
msgid "Sub-process %s received signal %u."
msgstr "Под-процесът %s получи сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Подпроцесът %s върна код за грешка (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Подпроцесът %s завърши неочаквано"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Неуспех при отварянето на файла %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Неуспех при отварянето на файлов манипулатор %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Неуспех при създаването на подпроцес IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Неуспех при изпълнението на компресиращата програма "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr ""
"грешка при четене, все още има %llu за четене, но няма нито един останал"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "грешка при запис, все още име %llu за запис, но не успя"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Проблем при затваряне на файла %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Проблем при преименуване на файла %s на %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Проблем при изтриване на файла %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Проблем при синхронизиране на файла"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "В %s няма инсталиран ключодържател."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Празен кеш на пакети"
@@ -2657,59 +2635,59 @@ msgstr "Тази версия на APT не поддържа система за
msgid "The package cache was built for a different architecture"
msgstr "Кешът на пакети е бил направен за различна архитектура"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Зависи от"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Предварително зависи от"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Предлага се"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Препоръчва се"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "В конфликт с"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Заменя"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Изважда от употреба"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Чупи"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Подобрява"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "важен"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "изискван"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "стандартен"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "незадължителен"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "допълнителен"
@@ -2816,12 +2794,12 @@ msgstr "Отваряне на %s"
msgid "Line %u too long in source list %s."
msgstr "Ред %u в списъка с източници %s е твърде дълъг."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
@@ -2865,7 +2843,7 @@ msgstr ""
"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
"него."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2873,12 +2851,12 @@ msgstr ""
"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
"причинено от задържани пакети."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Неуспех при коригирането на проблемите, имате задържани счупени пакети."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2928,12 +2906,12 @@ msgstr "Методът %s не стартира правилно"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Пакетната система „%s“ не е поддържана"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Неуспех при определянето на подходяща пакетна система"
@@ -2991,14 +2969,14 @@ msgstr "Кешът има несъвместима система за верс
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Възникна грешка при обработката на %s (%s%d)"
@@ -3023,27 +3001,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Четене на списъците с пакети"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Събиране на информация за „Осигурява“"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
@@ -3056,12 +3034,12 @@ msgstr "преименуването се провали, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Несъответствие на контролна сума MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Несъответствие на контролната сума"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3070,16 +3048,16 @@ msgstr ""
"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
"list или повреден файл)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Не е открита контролна сума за „%s“ във файла Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3088,27 +3066,27 @@ msgstr ""
"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
"прилагат обновявания от това хранилище."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се "
"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Грешка от GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3117,7 +3095,7 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3126,38 +3104,38 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Несъответствие на размера"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Неуспех при анализиране на файл Release %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Във файла Release %s липсват раздели"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Във файла Release %s липсва контролна сума"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Неправилна стойност за „Date“ във файла Release %s"
@@ -3257,22 +3235,22 @@ msgstr "Запазване на новия списък с източници\n"
msgid "Source list entries for this disc are:\n"
msgstr "Записите в списъка с източници за този диск са:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Записани са %i записа.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Записани са %i записа с %i липсващи файла.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Записани са %i записа с %i несъответстващи файла\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
@@ -3287,6 +3265,17 @@ msgstr "Не е намерен oторизационен запис за: %s"
msgid "Hash mismatch for: %s"
msgstr "Несъответствие на контролната сума за: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "В %s няма инсталиран ключодържател."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3360,117 +3349,117 @@ msgstr ""
"Външната програма за удовлетворяване на зависимости се провали без да изведе "
"съобщение за грешка"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Инсталиране на %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Конфигуриране на %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Окончателно премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Отбелязване на изчезването на %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Изпълнение на тригер след инсталиране %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Директорията „%s“ липсва"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Неуспех при отваряне на файла „%s“"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Подготвяне на %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Разпакетиране на %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Подготвяне на %s за конфигуриране"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s е инсталиран"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Подготвяне за премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s е премахнат"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка за пълно премахване на %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s е напълно премахнат"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е "
"монтирана?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Изпълняване на dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Операцията е прекъсната"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Поради достигане на максималния брой доклади (MaxReports) не е записан нов "
"доклад за зависимостите."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "отлагане на настройката поради неудовлетворени зависимости"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3478,7 +3467,7 @@ msgstr ""
"Доклад за зависимостите не е записан защото съобщението за грешка е породено "
"от друга грешка."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3494,7 +3483,13 @@ msgstr ""
"Доклад за зависимостите не е записан защото грешката е причинена от "
"недостатъчна оперативна памет"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3530,8 +3525,20 @@ msgstr ""
msgid "Not locked"
msgstr "Без заключване"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Готово"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се "
+#~ "използват старите индексни файлове. Грешка от GPG: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Пропускане на несъществуващ файл %s"
diff --git a/po/bs.po b/po/bs.po
index 7dbe5c0be..84d6787be 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+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"
@@ -73,28 +73,28 @@ msgstr "Ukupno Verzija/Datoteka odnosa:"
#: cmdline/apt-cache.cc:345
msgid "Total Provides mappings: "
-msgstr ""
+msgstr "Ukupno „obezbeđuje“ mapiranja: "
#: cmdline/apt-cache.cc:357
msgid "Total globbed strings: "
-msgstr ""
+msgstr "Ukupno globiranih znakovnih nizova: "
#: cmdline/apt-cache.cc:371
msgid "Total dependency version space: "
-msgstr ""
+msgstr "Ukupan prostor verzija zavisnosti: "
#: cmdline/apt-cache.cc:376
msgid "Total slack space: "
-msgstr ""
+msgstr "Ukupan nepopunjen prostor: "
#: cmdline/apt-cache.cc:384
msgid "Total space accounted for: "
-msgstr ""
+msgstr "Ukupno uračunatog prostora: "
#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147
#, c-format
msgid "Package file %s is out of sync."
-msgstr ""
+msgstr "Paketski fajl %s nije sinhronizovan."
#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
@@ -104,11 +104,11 @@ msgstr "Paketi nisu pronađeni"
#: cmdline/apt-cache.cc:1226
msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "Morate dati bar jedan uzorak za pretraživanje"
#: cmdline/apt-cache.cc:1361
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "Ova komanda je zastarjela. Umjesto nje koristite 'apt-mark showauto'."
#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
#, c-format
@@ -121,16 +121,16 @@ msgstr "Datoteke paketa:"
#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
+msgstr "Keš nije sinhronizovan, ne mogu unakrsno povezati paketski fajl"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1507
msgid "Pinned packages:"
-msgstr ""
+msgstr "Fiksirani paketi:"
#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
msgid "(not found)"
-msgstr ""
+msgstr "(nije nađeno)"
#: cmdline/apt-cache.cc:1527
msgid " Installed: "
@@ -138,28 +138,28 @@ msgstr " Instalirano:"
#: cmdline/apt-cache.cc:1528
msgid " Candidate: "
-msgstr ""
+msgstr " Kandidat: "
#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
msgid "(none)"
-msgstr ""
+msgstr "Ni jedan(nema)"
#: cmdline/apt-cache.cc:1561
msgid " Package pin: "
-msgstr ""
+msgstr " Fiksacija paketa: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1570
msgid " Version table:"
-msgstr ""
+msgstr " Tabela verzija:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s za %s kompajlirano na %s %s\n"
#: cmdline/apt-cache.cc:1690
msgid ""
@@ -197,14 +197,47 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
+"Usage: apt-cache [opcije] naredba\n"
+" apt-cache [opcije] showpkg pak1 [pak2 ...]\n"
+" apt-cache [opcije] showsrc pak1 [pak2 ...]\n"
+"\n"
+"apt-cache alat niskog nivoa za čitanje informacija\n"
+"iz APT priručnog spremišta binarnih datoteka\n"
+"\n"
+"Komande:\n"
+" gencaches - Sagradi spremišta binarnih i izvornih datoteka\n"
+" showpkg - Prikaži opršte informacije za pojedinačni paket\n"
+" showsrc - Prikaži izvorne zapise\n"
+" stats - Prikaži osnovnu statistiku\n"
+" dump - Prikaži cijelu datoteku detaljno\n"
+" dumpavail - Štampaj dostupnu datoteku na standarni izlaz\n"
+" unmet - Prikaži nezadovoljene zavisnosti\n"
+" search - Pretraži listu paketa za regex uzorak\n"
+" show - Prikaži čitljiv zapis za paket\n"
+" depends - Prikaži sirovu zavisnost za paket\n"
+" rdepends - Prikaži informaciju o inverzonoj zavisnosti za paket\n"
+" pkgnames - Prikažio imena svih paketa u sistemu\n"
+" dotty - Generiši grafove paketa za GraphViz\n"
+" xvcg - Generiši grafove paketa za xvcg\n"
+" policy - Prikaži pravila\n"
+"\n"
+"opcije:\n"
+" -h Ovaj tekst pomoći.\n"
+" -p=? Priručno spremište paketa.\n"
+" -s=? Priručno spremište izvora.\n"
+" -q Onemogući inikator napretka.\n"
+" -i Prikaži samo važne zavisnosti za nezadovoljenu komandu.\n"
+" -c=? Pročitaj ovu koniguracionu datoteku\n"
+" -o=? Postavi proizvoljnu konfiguracionu opciju, npr. -o dir::cache=/tmp\n"
+"Vidi apt-cache(8) i apt.conf(5) stranice uputstava za više informacija.\n"
#: cmdline/apt-cdrom.cc:79
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "Molim vas dajte ime za ovaj Disk, kao što je 'Debian 5.0.3 Disk 1'"
#: cmdline/apt-cdrom.cc:94
msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Molim, ubacite disk u uređaj i pritisnite „Enter“"
#: cmdline/apt-cdrom.cc:129
#, fuzzy, c-format
@@ -213,7 +246,7 @@ msgstr "Ne mogu otvoriti %s"
#: cmdline/apt-cdrom.cc:163
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Ponovite proces za ostale CD-ove u vašem setu"
#: cmdline/apt-config.cc:46
msgid "Arguments not in pairs"
@@ -249,20 +282,20 @@ msgstr ""
#: cmdline/apt-get.cc:135
msgid "Y"
-msgstr ""
+msgstr "D"
#: cmdline/apt-get.cc:140
msgid "N"
-msgstr ""
+msgstr "N"
#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
-msgstr ""
+msgstr "Greška pri kompajliranju regularnog izraza - %s"
#: cmdline/apt-get.cc:260
msgid "The following packages have unmet dependencies:"
-msgstr ""
+msgstr "Sljedeći paketi imaju nezadovoljenje međuzavisnosti:"
#: cmdline/apt-get.cc:350
#, c-format
@@ -313,62 +346,64 @@ msgstr "Slijedeći paketi će biti nadograđeni:"
#: cmdline/apt-get.cc:488
msgid "The following packages will be DOWNGRADED:"
-msgstr ""
+msgstr "Sljedeći paketi će biti VRAĆENI NA STARU VERZIJU:"
#: cmdline/apt-get.cc:508
msgid "The following held packages will be changed:"
-msgstr ""
+msgstr "Sljedeći zadržani paketi će biti izmijenjeni:"
#: cmdline/apt-get.cc:563
#, c-format
msgid "%s (due to %s) "
-msgstr ""
+msgstr "%s (zbog %s) "
#: cmdline/apt-get.cc:571
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
+"UPOZORENJE: sljedeći esencijalni paketi će biti uklonjeni.\n"
+"Ovo NE TREBA da se radi ukoliko ne znate tačno šta radite!"
#: cmdline/apt-get.cc:602
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
+msgstr "%lu ažuriranih, %lu novoinstaliranih, "
#: cmdline/apt-get.cc:606
#, c-format
msgid "%lu reinstalled, "
-msgstr ""
+msgstr "%lu ponovo instaliranih, "
#: cmdline/apt-get.cc:608
#, c-format
msgid "%lu downgraded, "
-msgstr ""
+msgstr "%lu vraćenih na prethodnu verziju, "
#: cmdline/apt-get.cc:610
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
+msgstr "%lu za uklanjanje i %lu koji neće biti ažurirani.\n"
#: cmdline/apt-get.cc:614
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr ""
+msgstr "%lu koji nisu potpuno instalirani ili uklonjeni.\n"
#: cmdline/apt-get.cc:635
#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "Primjedba, izabiranje '%s' za zadatak '%s'\n"
#: cmdline/apt-get.cc:640
#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "Primjedba, izabiranje '%s' za regularni izraz '%s'\n"
#: cmdline/apt-get.cc:657
#, c-format
msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
+msgstr "Paket %s je virtuelni paket kojeg obezbeđuju:\n"
#: cmdline/apt-get.cc:668
msgid " [Installed]"
@@ -381,7 +416,7 @@ msgstr "Verzije kandidata"
#: cmdline/apt-get.cc:679
msgid "You should explicitly select one to install."
-msgstr ""
+msgstr "Morate eksplicitno izabrati jedan za instalaciju."
#: cmdline/apt-get.cc:682
#, c-format
@@ -390,6 +425,9 @@ msgid ""
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
+"Paket %s nije dostupan ali ga zahtjeva drugi paket.\n"
+"Ovo znači da paket ili nedostaje, ili je zastario,\n"
+"ili je dostupan samo iz nekog drugog izvora\n"
#: cmdline/apt-get.cc:700
msgid "However the following packages replace it:"
@@ -398,48 +436,49 @@ msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
#: cmdline/apt-get.cc:712
#, c-format
msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "Paket '%s' nema instalacionog kandidata"
#: cmdline/apt-get.cc:725
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "Virtualni paketi kao '%s' ne mogu biti obrisani\n"
#. TRANSLATORS: Note, this is not an interactive question
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
+"Paket '%s' nije instaliran, pa nije uklonjen. Da li ste mislili '%s'?\n"
#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
#, c-format
msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Paket '%s' nije instaliran, pa nije uklonjen\n"
#: cmdline/apt-get.cc:788
#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "Napomena, izabrano '%s' umjesto '%s'\n"
#: cmdline/apt-get.cc:818
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
+msgstr "Preskačem %s, pošto je već instaliran a ažuriranje nije zadato.\n"
#: cmdline/apt-get.cc:822
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
+msgstr "Preskakanje %s, nije istalirano i potrebne su samo nadogradnje.\n"
#: cmdline/apt-get.cc:834
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
+msgstr "Ne mogu ponovo da instaliram %s pošto ne može biti skinut.\n"
#: cmdline/apt-get.cc:839
#, c-format
msgid "%s is already the newest version.\n"
-msgstr ""
+msgstr "%s je već u najnovijoj verziji.\n"
#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68
#, fuzzy, c-format
@@ -449,12 +488,12 @@ msgstr "ali se %s treba instalirati"
#: cmdline/apt-get.cc:884
#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "Izabrana verzija '%s' (%s) za '%s'\n"
#: cmdline/apt-get.cc:889
#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Izabrana verzija '%s' (%s) za '%s' zbog '%s'\n"
#: cmdline/apt-get.cc:1025
msgid "Correcting dependencies..."
@@ -462,7 +501,7 @@ msgstr "Ispravljam zavisnosti..."
#: cmdline/apt-get.cc:1028
msgid " failed."
-msgstr ""
+msgstr " nije uspelo."
#: cmdline/apt-get.cc:1031
msgid "Unable to correct dependencies"
@@ -470,7 +509,7 @@ msgstr "Ne mogu ispraviti zavisnosti"
#: cmdline/apt-get.cc:1034
msgid "Unable to minimize the upgrade set"
-msgstr ""
+msgstr "Nisam uspeo da minimizujem skup za ažuriranje"
#: cmdline/apt-get.cc:1036
msgid " Done"
@@ -478,7 +517,7 @@ msgstr " Urađeno"
#: cmdline/apt-get.cc:1040
msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
+msgstr "Trebali biste pokrenuti 'apt-get -f install' da bi popravili ovo."
#: cmdline/apt-get.cc:1043
msgid "Unmet dependencies. Try using -f."
@@ -491,49 +530,49 @@ msgstr "Slijedeći paketi će biti nadograđeni:"
#: cmdline/apt-get.cc:1072
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Upozorenje o verifikaciji premošćeno.\n"
#: cmdline/apt-get.cc:1079
msgid "Install these packages without verification [y/N]? "
-msgstr ""
+msgstr "Želite li da instalirate ove pakete bez verifikacije [d/N]? "
#: cmdline/apt-get.cc:1081
msgid "Some packages could not be authenticated"
-msgstr ""
+msgstr "Neki paketi nisu mogli biti verifikovani"
#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
msgid "There are problems and -y was used without --force-yes"
-msgstr ""
+msgstr "Postoje problemi a opcija -y je korišćena bez opcije --force-yes"
#: cmdline/apt-get.cc:1131
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Interna greška, InstallPackages je pozvan sa neispravnim paketima!"
#: cmdline/apt-get.cc:1140
msgid "Packages need to be removed but remove is disabled."
-msgstr ""
+msgstr "Paketi treba da budu uklonjeni ali uklanjanje je onemogućeno."
#: cmdline/apt-get.cc:1151
msgid "Internal error, Ordering didn't finish"
-msgstr ""
+msgstr "Interna greška, ·Ordering nije završio"
#: cmdline/apt-get.cc:1189
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "Čudno... veličine se razlikuju, obavijestite apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
#: cmdline/apt-get.cc:1196
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr ""
+msgstr "Moram da dovučem %sB/%sB arhiva.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
#: cmdline/apt-get.cc:1201
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr ""
+msgstr "Moram da dovučem %sB arhiva.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
@@ -541,28 +580,29 @@ msgstr ""
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
+"Nakon ove operacije %sB dodatnog prostora na disku će biti iskorišćeno.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
#: cmdline/apt-get.cc:1213
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
+msgstr "Nakon ove operacije %sB prostora na disku će biti oslobođeno.\n"
#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591
#: cmdline/apt-get.cc:2594
#, c-format
msgid "Couldn't determine free space in %s"
-msgstr ""
+msgstr "Ne mogu da odredim slobodan prostor na %s"
#: cmdline/apt-get.cc:1241
#, c-format
msgid "You don't have enough free space in %s."
-msgstr ""
+msgstr "Nemate dovoljno slobodnog prostora na %s."
#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1279
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
+msgstr "Specificirano „Samo trivijalno“ ali ovo nije trivijalna operacija."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
@@ -577,6 +617,9 @@ msgid ""
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
+"Krenuli ste da uradite nešto što može potencijalno biti štetno.\n"
+"Da biste nastavili, ukucajte frazu „%s“\n"
+" ?] "
#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288
msgid "Abort."
@@ -587,32 +630,34 @@ msgstr "Odustani."
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr ""
+msgstr "Nisam uspeo da dovučem %s %s\n"
#: cmdline/apt-get.cc:1374
msgid "Some files failed to download"
-msgstr ""
+msgstr "Neki fajlovi se nisu skinuli"
#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668
msgid "Download complete and in download only mode"
-msgstr ""
+msgstr "U „samo daunloud“ modu sam, a daunloudovanje je završeno"
#: cmdline/apt-get.cc:1381
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
+"Nisam uspeo da skinem neke arhive, možda bi trebalo da izvršite „apt-get "
+"update“ ili pokušate sa opcijom --fix-missing?"
#: cmdline/apt-get.cc:1385
msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
+msgstr "--fix-missing i zamjena medija nisu trenutno podržani"
#: cmdline/apt-get.cc:1390
msgid "Unable to correct missing packages."
-msgstr ""
+msgstr "Nisam mogao da ispravim nedostajuće pakete."
#: cmdline/apt-get.cc:1391
msgid "Aborting install."
@@ -630,37 +675,39 @@ msgstr[1] ""
#: cmdline/apt-get.cc:1423
msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
+msgstr "Napomena: Ovo je dpkg uradio automatski i namjenskui."
#: cmdline/apt-get.cc:1561
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Zanemariti nedostupnu ciljanu verziju '%s' od paketa '%s'"
#: cmdline/apt-get.cc:1593
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "Izabiranje '%s' kao izvor paketa umjesto '%s'\n"
#. if (VerTag.empty() == false && Last == 0)
#: cmdline/apt-get.cc:1631
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Ignoriši nedostupnu verziju '%s' od paketa '%s'"
#: cmdline/apt-get.cc:1647
msgid "The update command takes no arguments"
-msgstr ""
+msgstr "Komanda „update“ nema argumenata"
#: cmdline/apt-get.cc:1713
msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
+msgstr "Ne bi trebalo da brišemo stvari, ne mogu da pokrenem AutoRemover"
#: cmdline/apt-get.cc:1817
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
+"Hm, izgleda da je AutoRemover uništio nešto što stvarno nije smelo\n"
+"da se desi. Molim, zavidite izvještaj o greški za apt."
#.
#. if (Packages == 1)
@@ -674,11 +721,11 @@ msgstr ""
#.
#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989
msgid "The following information may help to resolve the situation:"
-msgstr ""
+msgstr "Sljedeće informacije mogu pomoći da se razriješi situacija:"
#: cmdline/apt-get.cc:1824
msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
+msgstr "Interna greška, AutoRemover je nešto zeznuo"
#: cmdline/apt-get.cc:1831
#, fuzzy
@@ -706,17 +753,19 @@ msgstr[1] ""
#: cmdline/apt-get.cc:1856
msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
+msgstr "Interna greška, AllUpgrade je nešto zeznuo"
#: cmdline/apt-get.cc:1955
msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
+msgstr "Trebali bi ste da pokrenete 'apt-get -f install' da popravite ove:"
#: cmdline/apt-get.cc:1959
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
+"Nezadovoljenje međuzavisnosti. Probajte „apt-get -f install“ bez paketa (ili "
+"navedite rešenje)."
#: cmdline/apt-get.cc:1974
msgid ""
@@ -725,6 +774,10 @@ msgid ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
+"Ne mogu da instaliram neke pakete. Ovo može značiti da ste\n"
+"zahtijevali nemoguću situaciju ili da koristite nestabilnu\n"
+"distribuciju gdje neki zahtijevani paketi još uvijek nisu napravljeni\n"
+"ili su povučeni sa liste."
#: cmdline/apt-get.cc:1995
msgid "Broken packages"
@@ -745,7 +798,7 @@ msgstr "Preporučeni paketi:"
#: cmdline/apt-get.cc:2154
#, c-format
msgid "Couldn't find package %s"
-msgstr ""
+msgstr "Ne mogu da pronađem paket %s"
#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70
#, fuzzy, c-format
@@ -757,12 +810,14 @@ msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
+"Ova komanda je zastarjela. Umjesto nje koristite \"apt-mark auto' i 'apt-"
+"mark manual'"
#: cmdline/apt-get.cc:2185
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Neuspješno"
@@ -772,30 +827,30 @@ msgstr "Urađeno"
#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268
msgid "Internal error, problem resolver broke stuff"
-msgstr ""
+msgstr "Interna greška, razrešivač problema je nešto zeznuo"
#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332
msgid "Unable to lock the download directory"
-msgstr ""
+msgstr "Ne mogu da zaključam daunloud direktorijum"
#: cmdline/apt-get.cc:2388
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgstr "Ne mobu naći izvor za preuzimanje verzije '%s' od '%s'"
#: cmdline/apt-get.cc:2393
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "Preuzimanje %s %s"
#: cmdline/apt-get.cc:2453
msgid "Must specify at least one package to fetch source for"
-msgstr ""
+msgstr "Morate navesti makar jedan paket čiji izvorni kod želite"
#: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805
#, c-format
msgid "Unable to find a source package for %s"
-msgstr ""
+msgstr "Ne mogu da nađem paket sa izvornim kodom za %s"
#: cmdline/apt-get.cc:2510
#, c-format
@@ -803,6 +858,9 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
+"PRIMETITE: o „%s“ paketu se vodi računa u „%s“ verziji sistema kontrole "
+"na:\n"
+"%s\n"
#: cmdline/apt-get.cc:2515
#, c-format
@@ -811,67 +869,72 @@ msgid ""
"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
+"Molim koristite:\n"
+"bzr branch %s\n"
+"da dobijete najnovije (možda neobjavljene) nadogradnje na pakete\n"
#: cmdline/apt-get.cc:2568
#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr ""
+msgstr "Preskačem fajl „%s“ koji je već skinut\n"
#: cmdline/apt-get.cc:2605
#, c-format
msgid "You don't have enough free space in %s"
-msgstr ""
+msgstr "Nemate dovoljno prostora na %s"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
#: cmdline/apt-get.cc:2614
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr ""
+msgstr "Treba da skinem %sB/%sB arhiva sa izvornim kodom.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
#: cmdline/apt-get.cc:2619
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr ""
+msgstr "Treba da skinem %sB arhiva sa izvornim kodom.\n"
#: cmdline/apt-get.cc:2625
#, c-format
msgid "Fetch source %s\n"
-msgstr ""
+msgstr "Dovuci izvorni kod %s\n"
#: cmdline/apt-get.cc:2663
msgid "Failed to fetch some archives."
-msgstr ""
+msgstr "Nisam uspeo da dovučem neke arhive."
#: cmdline/apt-get.cc:2694
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
+msgstr "Preskačem raspakivanje već raspakovanog izvornog koda u %s\n"
#: cmdline/apt-get.cc:2706
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr ""
+msgstr "Komanda za raspakivanje „%s“ nije uspjela.\n"
#: cmdline/apt-get.cc:2707
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Provjeravam da li je instaliran paket „dpkg-dev“.\n"
#: cmdline/apt-get.cc:2729
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr ""
+msgstr "Komanda za pravljenje „%s“ nije uspjela.\n"
#: cmdline/apt-get.cc:2749
msgid "Child process failed"
-msgstr ""
+msgstr "Podproces se nije izvršio uspješno"
#: cmdline/apt-get.cc:2768
msgid "Must specify at least one package to check builddeps for"
msgstr ""
+"Da biste provjerili međuzavisnosti pri pravljenju paketa morate navesti "
+"makar jedan paket"
#: cmdline/apt-get.cc:2793
#, c-format
@@ -879,16 +942,19 @@ msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"Nema dostupne informacije o paketu za %s. Vidi apt.conf(5) APT::"
+"Architectures za postavku"
#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
+"Ne mogu da dobijem informacije o međuzavisnosti pri pravljenju za paket %s"
#: cmdline/apt-get.cc:2840
#, c-format
msgid "%s has no build depends.\n"
-msgstr ""
+msgstr "%s nema međuzavisnosti pri pravljenju.\n"
#: cmdline/apt-get.cc:3010
#, c-format
@@ -896,6 +962,8 @@ msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
+"%s ovisnost za %s can't se ne može zadovoljiti jer %s nije dopušten nad '%s' "
+"paketima"
#: cmdline/apt-get.cc:3028
#, c-format
@@ -903,11 +971,15 @@ msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
+"%s međuzavisnost za %s ne može biti zadovoljena jer ne mogu da pronađem "
+"paket %s"
#: cmdline/apt-get.cc:3051
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
+"Nisam uspeo da zadovoljim %s međuzavisnost za %s: Instalirani paket %s ima "
+"noviju verziju od zahtjevane"
#: cmdline/apt-get.cc:3090
#, c-format
@@ -915,6 +987,8 @@ msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
+"%s ovisnost za %s can't se ne može zadovoljiti jer verzija paketa koja je "
+"kandidat %s ne može zadovoljiti zahtjeve verzije"
#: cmdline/apt-get.cc:3096
#, c-format
@@ -922,31 +996,33 @@ msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
+"%s ovisnost za %s can't se ne može zadovoljiti jer paket %s nema verziju "
+"koja je kandidat"
#: cmdline/apt-get.cc:3119
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
+msgstr "Nisam uspeo da zadovoljim %s međuzavisnost za %s: %s"
#: cmdline/apt-get.cc:3135
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
+msgstr "Ne mogu da zadovoljim međuzavisnosti pri pravljenju za %s."
#: cmdline/apt-get.cc:3140
msgid "Failed to process build dependencies"
-msgstr ""
+msgstr "Nisam uspeo da procesiram međuzavisnosti pri pravljenju"
#: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245
#, c-format
msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Promjene za %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -991,40 +1067,86 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-
-#: cmdline/apt-get.cc:3574
+"Upotreba: apt-get [opcije] naredba\n"
+"apt-get [opcije] install|remove pkg1 [pkg2 ...]\n"
+"apt-get [opcije] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get je jednostavan pristup iz komandne linije za skidanje i\n"
+"instaliranje paketa. Najčešće korištene naredbe su update\n"
+"i install.\n"
+"\n"
+"Komande:\n"
+" update - Preuzima novu listu paketa\n"
+" upgrade - Obavlja nadogradnje\n"
+" install - Instalira nove pakete (paket se zove libc6 a ne libc6.deb)\n"
+" remove - Uklanja pakete\n"
+" autoremove - Automatski uklanja nekorištene pakete\n"
+" purge - Uklanja pakete i konfiguracione datoteke\n"
+" source - Preuzima arhive s izvornim kodom\n"
+" build-dep - Konfiguriše potrebne zavisnosti za izvorne pakete\n"
+" dist-upgrade - Distribucijska nadogradnja, vidi apt-get(8)\n"
+" dselect-upgrade - Prati dselect selekcije\n"
+" clean - Obriši preuzete arhivirane datoteke\n"
+" autoclean - Obriši stare preuzete arhivirane datoteke\n"
+" check - Provjeri da nema oštećenih ovisnosti\n"
+" changelog - Preuzmi i prikaži changelog za dati paket\n"
+" download - Preuzmi binarni paket u dati direktorij\n"
+"\n"
+"Opcije:\n"
+" -h Ova pomoć.\n"
+" -q Evidentiran izlaz - bez indikatora napretka\n"
+" -qq Bez izlaza osim grešaka\n"
+" -d Samo preuzimanje - NE instalirati niti otpakivati arhive\n"
+" -s Bez djelovanja, samo simulacija\n"
+" -y Pretpostavi yes na sva pitanja i ne pitaj\n"
+" -f Pokušaj popraviti sistem s oštećenim zavisnostima\n"
+" -m Pokišaj nastaviti ako se arhive ne mogu locirati\n"
+" -u Prikaži listu nadograđenih paketa\n"
+" -b Sagradi izvorni paket nakon preuzimanja\n"
+" -V Prikaži detaljne brojeve verzija\n"
+" -c=? Pročitaj konfiguracionu datoteku\n"
+" -o=? Postavi proizvoljnu konfiguracionu opciju, npr -o dir::cache=/tmp\n"
+"Pogledajte man stranice the apt-get(8), sources.list(5) i apt.conf(5)\n"
+"za više informacija i opcija.\n"
+" Ovaj APT je moćan kao superkrava.\n"
+
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"Primjedba: Ovo je samo simulacija!\n"
+" apt-get treba root privilegije za pravo izvršavanje.\n"
+" Obratite pažnju da je zaključavanje deaktivirano,\n"
+" dakle nemojte ovisiti na relevantnost u odnosu na realnu situaciju!"
#: cmdline/acqprogress.cc:60
msgid "Hit "
-msgstr ""
+msgstr "Našao sam: "
#: cmdline/acqprogress.cc:84
msgid "Get:"
-msgstr ""
+msgstr "Preuzimam:"
#: cmdline/acqprogress.cc:115
msgid "Ign "
-msgstr ""
+msgstr "Preskačem: "
#: cmdline/acqprogress.cc:119
msgid "Err "
-msgstr ""
+msgstr "Greška: "
#: cmdline/acqprogress.cc:140
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Dovukao %sB u %s (%sB/s)\n"
#: cmdline/acqprogress.cc:230
#, c-format
msgid " [Working]"
-msgstr ""
+msgstr " [Radim]"
#: cmdline/acqprogress.cc:286
#, c-format
@@ -1033,6 +1155,9 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
+"Promjena medijuma: molim ubacite disk označen sa\n"
+" „%s“\n"
+"u uređaj „%s“ i pritisnite enter\n"
#: cmdline/apt-mark.cc:55
#, fuzzy, c-format
@@ -1052,19 +1177,18 @@ msgstr "ali se %s treba instalirati"
#: cmdline/apt-mark.cc:228
#, c-format
msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s je bio već postavljen na čekanje\n"
#: cmdline/apt-mark.cc:230
#, c-format
msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s već nije bio na čekanju.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr ""
+msgstr "Čekao na %s ali nije bilu tu"
#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
#, fuzzy, c-format
@@ -1078,7 +1202,7 @@ msgstr "Ne mogu otvoriti %s"
#: cmdline/apt-mark.cc:332
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Izvršenje dpkg neuspjelo. Da li ste root?"
#: cmdline/apt-mark.cc:379
msgid ""
@@ -1101,17 +1225,38 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
+"Upotreba: apt-mark [oppcije] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark je jednostavno komandno sučelje za označavanje paketa kao ručno "
+"ili\n"
+"automattski instaliranih. Ono također lista markere.\n"
+"\n"
+"Komande:\n"
+" auto - Označava date pakete kao automatski instalirane\n"
+" manual - Označava date pakete kao ručno instalirane\n"
+"\n"
+"Opcije:\n"
+" -h Ova pomoć.\n"
+" -q Evidentiran izlaz - bez indikatora napretka\n"
+" -qq Bez izlaza osim grešaka\n"
+" -s Bez djelovanja, samo simulacija\n"
+" -f čita/piše auto/ručno markiranje u datoj datoteci\n"
+" -c=? Pročitaj konfiguracionu datoteku\n"
+" -o=? Postavi proizvoljnu konfiguracionu opciju, npr -o dir::cache=/tmp\n"
+"Vidi stranice apt-mark(8) i apt.conf(5) za više informacija"
#: methods/cdrom.cc:203
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr ""
+msgstr "Ne mogu da učitam bazu podataka diska %s"
#: methods/cdrom.cc:212
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
+"Molim da koristite apt-cdrom da bi APT mogao prepoznati CD-ROM. apt-get "
+"update se ne može koristiti za dodavanje novih CD-ROMova"
#: methods/cdrom.cc:222
#, fuzzy
@@ -1135,15 +1280,15 @@ msgstr "Datoteka nije pronađena"
#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
#: methods/rred.cc:512 methods/rred.cc:521
msgid "Failed to stat"
-msgstr ""
+msgstr "Ne mogu da obavim funckiju stat"
#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
msgid "Failed to set modification time"
-msgstr ""
+msgstr "Ne mogu da postavim vrijeme izmjene"
#: methods/file.cc:47
msgid "Invalid URI, local URIS must not start with //"
-msgstr ""
+msgstr "Neispravan URI, lokalni URIS ne smije poceti sa //"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:173
@@ -1152,59 +1297,61 @@ msgstr "Prijavljujem se"
#: methods/ftp.cc:179
msgid "Unable to determine the peer name"
-msgstr ""
+msgstr "Ne mogu da odredim peer ime"
#: methods/ftp.cc:184
msgid "Unable to determine the local name"
-msgstr ""
+msgstr "Ne mogu da odredim lokalno ime"
#: methods/ftp.cc:215 methods/ftp.cc:243
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr ""
+msgstr "Server je odbio konekciju, poruka servera: %s"
#: methods/ftp.cc:221
#, c-format
msgid "USER failed, server said: %s"
-msgstr ""
+msgstr "USER nije tačan, poruka servera: %s"
#: methods/ftp.cc:228
#, c-format
msgid "PASS failed, server said: %s"
-msgstr ""
+msgstr "PASS nije tačan, poruka servera:%s"
#: methods/ftp.cc:248
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
+"Zamjenski server je specificiran ali nema , Acquire::ftp::ProxyLogin je "
+"prazan"
#: methods/ftp.cc:276
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr ""
+msgstr "Komanda login skripte '%s' nije valjana, poruka servera: %s"
#: methods/ftp.cc:302
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr ""
+msgstr "TYPE neispravan, poruka servera: %s"
#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
msgid "Connection timeout"
-msgstr ""
+msgstr "Vrijeme za vezu isteklo"
#: methods/ftp.cc:346
msgid "Server closed the connection"
msgstr "Server je zatvorio vezu"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Greška pri čitanju"
#: methods/ftp.cc:356 methods/rsh.cc:206
msgid "A response overflowed the buffer."
-msgstr ""
+msgstr "Odgovor je prenapunio bafer."
#: methods/ftp.cc:373 methods/ftp.cc:385
#, fuzzy
@@ -1212,181 +1359,178 @@ msgid "Protocol corruption"
msgstr "Oštećenje protokola"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Greška pri pisanju"
#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
msgid "Could not create a socket"
-msgstr ""
+msgstr "Nije moguće napraviti socket"
#: methods/ftp.cc:707
msgid "Could not connect data socket, connection timed out"
-msgstr ""
+msgstr "Nije moguce povezati data socket, konekcija pauzirana"
#: methods/ftp.cc:713
msgid "Could not connect passive socket."
-msgstr ""
+msgstr "Nije moguce povezati pasivni socket"
#: methods/ftp.cc:730
msgid "getaddrinfo was unable to get a listening socket"
-msgstr ""
+msgstr "getaffrinfo nije uspio dobiti listing socketa"
#: methods/ftp.cc:744
msgid "Could not bind a socket"
-msgstr ""
+msgstr "Nije moguće spojiti socket"
#: methods/ftp.cc:748
msgid "Could not listen on the socket"
-msgstr ""
+msgstr "Ne mogu slušati na socket-u"
#: methods/ftp.cc:755
msgid "Could not determine the socket's name"
-msgstr ""
+msgstr "Nije moguće odreditii ime socket-a"
#: methods/ftp.cc:787
msgid "Unable to send PORT command"
-msgstr ""
+msgstr "Nije moguće poslati PORT komandu"
#: methods/ftp.cc:797
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr ""
+msgstr "Nepoznata family adresa %u(AF_*)"
#: methods/ftp.cc:806
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr ""
+msgstr "EPRT neuspio, poruka servera: %s"
#: methods/ftp.cc:826
msgid "Data socket connect timed out"
-msgstr ""
+msgstr "Data socket konekcija pauzirana"
#: methods/ftp.cc:833
msgid "Unable to accept connection"
-msgstr ""
+msgstr "Nije moguće prihvatiti konekciju"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
-msgstr ""
+msgstr "Problem u heširanju datoteke"
#: methods/ftp.cc:885
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr ""
+msgstr "Nije moguće dobaviti datoteku, poruka servera '%s'"
#: methods/ftp.cc:900 methods/rsh.cc:330
msgid "Data socket timed out"
-msgstr ""
+msgstr "Data socket pauziran"
#: methods/ftp.cc:930
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr ""
+msgstr "Transfer podataka neuspio, poruka servera '%s'"
#. Get the files information
#: methods/ftp.cc:1007
msgid "Query"
-msgstr ""
+msgstr "Upit"
#: methods/ftp.cc:1119
msgid "Unable to invoke "
-msgstr ""
+msgstr "Nije moguće pozvati "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
-msgstr ""
+msgstr "Povezivanje sa %s(%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
-msgstr ""
+msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
+msgstr "Nije moguće napraviti socket za %s(f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr ""
+msgstr "Ne mogu uspostaviti vezu sa %s:%s(%s)"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
+msgstr "Nije moguće uspostaviti konekciju sa %s:%s (%s), konekcija pauzirana"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr ""
+msgstr "Nije moguće uspostaviti konekciju sa %s:%s (%s"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Povezujem se sa %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
-msgstr ""
+msgstr "Nije moguće razlučiti '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr ""
-
-#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s'"
-msgstr ""
+msgstr "Rješavam trenutni neuspijeh '%s'"
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "Nešto se čudno desilo pri razrješavanju '%s:%s' (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ne mogu se povezati sa %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "Interna greška: Dobar potpis, ali ne mogu izabrati otisak ključa?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Naišao sam na najmanje jedan neispravan potpis."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
+"Ne mogu izvršiti 'gpgv' da provjerim potpis (da li je gpgv instaliran?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Nepoznata greška izvršava gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Sljedeći potpisi ne mogu biti verifikovani jer javni ključ nije dostupan:\n"
#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "Prazne datoteke ne mogu biti važeće arhive"
#: methods/http.cc:394
msgid "Waiting for headers"
@@ -1394,75 +1538,75 @@ msgstr "Čekam na zaglavlja"
#: methods/http.cc:544
msgid "Bad header line"
-msgstr ""
+msgstr "Loše zaglavlje"
#: methods/http.cc:569 methods/http.cc:576
msgid "The HTTP server sent an invalid reply header"
-msgstr ""
+msgstr "HTTP server je poslao neispravno povratno zaglavlje"
#: methods/http.cc:606
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
+msgstr "HTTP server je poslao neispravno zaglavlje dužine sadržaja"
#: methods/http.cc:621
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
+msgstr "HTTP server je poslao neispravno zaglavlje opsega sadržaja"
#: methods/http.cc:623
msgid "This HTTP server has broken range support"
-msgstr ""
+msgstr "HTTP server ima oštećen opseg podrške"
#: methods/http.cc:647
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
-msgstr ""
+msgstr "Izbor neuspio"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
-msgstr ""
+msgstr "Vezi isteklo vrijeme"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
-msgstr ""
+msgstr "Greška pri pisanju u izlaznu datoteku"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
-msgstr ""
+msgstr "Greška pri upisu u datoteku"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
-msgstr ""
+msgstr "Greška pri pisanju u datoteku"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
-msgstr ""
+msgstr "Greška pri čitanju sa servera. Udaljeni kraj zatvorio konekciju."
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
-msgstr ""
+msgstr "Greška pri čitanju sa servera"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
-msgstr ""
+msgstr "Loše zaglavlje podatka"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Unutrašnja greška"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Ne mogu čitati %s"
@@ -1473,14 +1617,14 @@ msgstr "Ne mogu čitati %s"
#: apt-pkg/clean.cc:123
#, c-format
msgid "Unable to change to %s"
-msgstr ""
+msgstr "Ne mogu da promijenim na %s"
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
#: methods/mirror.cc:280
#, c-format
msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "Mirror datoteke '%s' nije nađena "
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
@@ -1492,7 +1636,7 @@ msgstr "Ne mogu otvoriti %s"
#: methods/mirror.cc:442
#, c-format
msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[Mirror: %s]"
#: methods/rred.cc:491
#, c-format
@@ -1500,6 +1644,8 @@ msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
+"Ne mogu popraviti %s sa mmap sa upotrebom datotečne operacije - zakrpa je "
+"možda oštećena."
#: methods/rred.cc:496
#, c-format
@@ -1507,14 +1653,16 @@ msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
+"Ne mogu popraviti %s sa mmap (ali bez mmap specifične datoteke) - zakrpa je "
+"možda oštećena."
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
-msgstr ""
+msgstr "Nisam uspeo da napravim IPC cijev ka podprocesu"
#: methods/rsh.cc:338
msgid "Connection closed prematurely"
-msgstr ""
+msgstr "Konekcija prerano završena"
#: dselect/install:32
msgid "Bad default setting!"
@@ -1527,24 +1675,30 @@ msgstr "Pritisnite enter za nastavak."
#: dselect/install:91
msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr ""
+msgstr "Da li želite da obrišete stare .deb fajlove?"
#: dselect/install:101
msgid "Some errors occurred while unpacking. Packages that were installed"
msgstr ""
+"Neke greške su se pojavile prilikom raspakovanja. Paketa koji su bili "
+"instalirani"
#: dselect/install:102
msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "će biti podešeno. Ovo može rezultirati duplim greškama"
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr ""
+"ili greške nastale zbog nezadovoljenih međuzavisnosti. To je u redu, samo "
+"greške"
#: dselect/install:104
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
+"iznad ove poruke su bitne. Molim, ispravite ih i pritisnite [I] za "
+"ponovljenu instalaciju"
#: dselect/update:30
msgid "Merging available information"
@@ -1568,8 +1722,18 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+"Upotreba: apt-extracttemplates fajl1 [fajl2 ...]\n"
+"\n"
+"apt-extracttemplates je alat za izvlačenje konfiguracionih i šablonskih\n"
+"informacija iz debian paketa\n"
+"\n"
+"Opcije:\n"
+" -h Ovaj pomoćni tekst\n"
+" -t postavi privremeni direktorijum\n"
+" -c=? učitaj ovaj konfiguracioni fajl\n"
+" -o=? postavi proizvoljnu konfiguracionu opciju, npr. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Ne mogu zapisati na %s"
@@ -1581,27 +1745,27 @@ msgstr ""
#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
msgid "Package extension list is too long"
-msgstr ""
+msgstr "Lista paketskih proširenja je preduga"
#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
#, c-format
msgid "Error processing directory %s"
-msgstr ""
+msgstr "Greška prilikom procesiranja direktorijuma %s"
#: ftparchive/apt-ftparchive.cc:262
msgid "Source extension list is too long"
-msgstr ""
+msgstr "Izvorna lista proširenja je preduga"
#: ftparchive/apt-ftparchive.cc:379
msgid "Error writing header to contents file"
-msgstr ""
+msgstr "Greška pri upisivanju zaglavlja u fajl-sadržaj"
#: ftparchive/apt-ftparchive.cc:409
#, c-format
msgid "Error processing contents %s"
-msgstr ""
+msgstr "Greška prilikom procesiranja sadržaja %s"
#: ftparchive/apt-ftparchive.cc:597
msgid ""
@@ -1644,15 +1808,60 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
+"Upotreba: apt-ftparchive [opcije] komanda\n"
+"Komande: packages putanja_do_binarnih_paketa [fajl_sa_preinačenjima "
+"[prefiks_putanje]]\n"
+" sources putanja_do_izvornih_paketa [fajl_sa_preinačenjima "
+"[prefiks_putanje]]\n"
+" contents putanja\n"
+" release putanja\n"
+" generate konfiguracioni_fajl [grupe]\n"
+" clean konfiguracioni_fajl\n"
+"\n"
+"apt-ftparchive generiše indeksne fajlove za Debian arhive. Podržava\n"
+"mnogo različitih stilova generisanja indeksa: od potpuno automatizovanog\n"
+"do funkcionalne zamjene za dpkg-scanpackages i dpkg-scansources\n"
+"\n"
+"apt-ftparchive generiše Package fajlove od stabla .deb fajlova. Fajl\n"
+"Package sadrži u sebi sva kontrolna polja svakog od paketa\n"
+"kao i MD5 heševe i veličine fajlova. Preko fajla sa preinačenjima\n"
+"se mogu preinačiti vrijednosti za Priority i Section polja.\n"
+"\n"
+"Komanda apt-ftparchive na sličan način generiše i Sources fajlove od stabla ."
+"dsc\n"
+"fajlova. Opcija --source-override se može upotrijebiti da specificira fajl "
+"sa\n"
+"preinačenjima\n"
+"\n"
+"Komande „packages“ i „sources“ bi trebalo da se izvršavaju u korijenu "
+"stabla.\n"
+"putanja_do_binarnih_paketa bi trebalo da ukazuje na osnovu za rekurzivnu\n"
+"pretragu a fajl_sa_preinačenjima bi trebalo da sadrži preinačene parametre.\n"
+"Prefiks_putanje se nadovezuje na polja sa imenom fajla. Primjer upotrebe "
+"iz \n"
+"Debian arhive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opcije:\n"
+" -h ovaj pomoćni tekst\n"
+" --md5 generisanje MD5 suma\n"
+" -s=? izvorni fajl sa preinačenjima\n"
+" -q rad sa smanjenim ispisom\n"
+" -d=? izbor opcione baze za keširanje\n"
+" --no-delink uključivanje debagovanja za delink mod\n"
+" --contents generisanje sadržaja fajla\n"
+" -c=? učitaj ovaj konfiguracioni fajl\n"
+" -o=? postavi proizvoljnu konfiguracionu opciju"
#: ftparchive/apt-ftparchive.cc:803
msgid "No selections matched"
-msgstr ""
+msgstr "Nema stavki koje odgovaraju zadatom upitu"
#: ftparchive/apt-ftparchive.cc:881
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr ""
+msgstr "Neki fajlovi nedostaju u grupi paketskih fajlova „%s“"
#: ftparchive/cachedb.cc:47
#, c-format
@@ -1669,17 +1878,19 @@ msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
+"DB format nije validan. Ako ste unaprijedili sa starije verzije apt-a, molim "
+"vas obrišite i ponovo napravite bazu podataka."
#: ftparchive/cachedb.cc:81
#, fuzzy, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
-msgstr ""
+msgstr "Nisam uspeo da pristupim %s"
#: ftparchive/cachedb.cc:249
msgid "Archive has no control record"
@@ -1687,166 +1898,166 @@ msgstr "Arhiva nema kontrolnog zapisa"
#: ftparchive/cachedb.cc:490
msgid "Unable to get a cursor"
-msgstr ""
+msgstr "Ne mogu da dobijem kurzor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr ""
+msgstr "U: Ne mogu da pročitam direktorijum %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr ""
+msgstr "U: Ne mogu da pristupim %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
-msgstr ""
+msgstr "G: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
-msgstr ""
+msgstr "U: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
-msgstr ""
+msgstr "G: Greške se odnose na fajl "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
-msgstr ""
+msgstr "Nisam uspeo da razriješim %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
-msgstr ""
+msgstr "Kretanje po stablu nije uspelo"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Ne mogu otvoriti %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr ""
+msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
-msgstr ""
+msgstr "Nisam uspeo da pročitam link %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
-msgstr ""
+msgstr "Nisam uspeo da obrišem %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr ""
+msgstr "*** Nisam uspeo da napravim vezu %s na %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr ""
+msgstr " Dosegnuto ograničenje od %sB DeLinkova.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
-msgstr ""
+msgstr "Arhiva nema package polje"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
-msgstr ""
+msgstr " %s nema override stavku\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
-msgstr ""
+msgstr " %s održavalac je %s a ne %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
-msgstr ""
+msgstr " %s nema source override stavku\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
-msgstr ""
+msgstr " %s nema ni binary override stavku\n"
#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
msgid "realloc - Failed to allocate memory"
-msgstr ""
+msgstr "realloc - Nisam uspeo da alociram memoriju"
#: ftparchive/override.cc:35 ftparchive/override.cc:143
#, c-format
msgid "Unable to open %s"
-msgstr ""
+msgstr "Ne mogu da otvorim %s"
#: ftparchive/override.cc:61 ftparchive/override.cc:167
#, c-format
msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Loše formirano preklapanje %s linija %llu #1"
#: ftparchive/override.cc:75 ftparchive/override.cc:179
#, c-format
msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Loše formirano preklapanje %s linija %llu #2"
#: ftparchive/override.cc:89 ftparchive/override.cc:192
#, c-format
msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Loše formirano preklapanje %s linija %llu #3"
#: ftparchive/override.cc:128 ftparchive/override.cc:202
#, c-format
msgid "Failed to read the override file %s"
-msgstr ""
+msgstr "Nisam uspeo da učitam fajl sa preinačenjima %s"
#: ftparchive/multicompress.cc:70
#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr ""
+msgstr "Nepoznat algoritam za kompresiju „%s“"
#: ftparchive/multicompress.cc:100
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr ""
+msgstr "Kompresovani izlaz %s zahtjeva kompresioni skup"
#: ftparchive/multicompress.cc:189
msgid "Failed to create FILE*"
-msgstr ""
+msgstr "Nisam uspeo da napravim FILE*"
#: ftparchive/multicompress.cc:192
msgid "Failed to fork"
-msgstr ""
+msgstr "Nisam uspeo da kreiram novi proces"
#: ftparchive/multicompress.cc:206
msgid "Compress child"
-msgstr ""
+msgstr "Dete-proces koji kompresuje"
#: ftparchive/multicompress.cc:229
#, c-format
msgid "Internal error, failed to create %s"
-msgstr ""
+msgstr "Interna greška, nisam uspeo da napravim %s"
#: ftparchive/multicompress.cc:304
msgid "IO to subprocess/file failed"
-msgstr ""
+msgstr "UI ka podprocesu/fajlu nije uspeo"
#: ftparchive/multicompress.cc:342
msgid "Failed to read while computing MD5"
-msgstr ""
+msgstr "Nisam uspeo da učitam podatke dok sam izračunavao MD5"
#: ftparchive/multicompress.cc:358
#, c-format
msgid "Problem unlinking %s"
-msgstr ""
+msgstr "Problem pri brisanju %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
-msgstr ""
+msgstr "Nisam uspeo da preimenujem %s u %s"
#: cmdline/apt-internal-solver.cc:37
msgid ""
@@ -1861,6 +2072,16 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver je veza da se trenutni internom razrješavač\n"
+"koristi kao vanjski razrješavač za APT familiju radi debagovanja i sličnog\n"
+"\n"
+"Opcije:\n"
+" -h Ova pomoć.\n"
+" -q Evidentiran izlaz - bez indikatora napretka\n"
+" -c=? Pročitaj konfiguracionu datoteku\n"
+" -o=? Postavi proizvoljnu konfiguracionu opciju, npr -o dir::cache=/tmp\n"
#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
@@ -1879,10 +2100,21 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+"Upotreba: apt-sortpkgs [opcije] fajl1 [fajl2 ...]\n"
+"\n"
+"apt-sortpkgs je jednostavan alat za sortiranje paketskih fajlova. Opcija -s "
+"se koristi\n"
+"da označi vrstu fajla.\n"
+"\n"
+"Opcije:\n"
+" -h Ovaj pomoćni tekst\n"
+" -s Koristi sortiranje fajlova sa izvornim kodom\n"
+" -c=? Učitaj ovaj konfiguracioni fajl\n"
+" -o=? Postavi neku konfiguracionu opciju, npr -o dir::cache=/tmp\n"
#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
-msgstr ""
+msgstr "Ne mogu stvoriti cijevi"
#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
@@ -1899,24 +2131,24 @@ msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
#: apt-inst/contrib/extracttar.cc:303
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr ""
+msgstr "Nepoznati tip TAR zaglavlja %u, član %s"
#: apt-inst/contrib/arfile.cc:74
msgid "Invalid archive signature"
-msgstr ""
+msgstr "Nevažeća oznaka arhive"
#: apt-inst/contrib/arfile.cc:82
msgid "Error reading archive member header"
-msgstr ""
+msgstr "Greška pri čitanju zaglavlja člana arhive"
#: apt-inst/contrib/arfile.cc:94
#, c-format
msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "Pogrešno zaglavlje člana arhive %s"
#: apt-inst/contrib/arfile.cc:106
msgid "Invalid archive member header"
-msgstr ""
+msgstr "Nevažeće zaglavlje člana arhive"
#: apt-inst/contrib/arfile.cc:132
msgid "Archive is too short"
@@ -1924,38 +2156,38 @@ msgstr "Arhiva je prekratka"
#: apt-inst/contrib/arfile.cc:136
msgid "Failed to read the archive headers"
-msgstr ""
+msgstr "Ne mogu pročitati zaglavlja arhive"
#: apt-inst/filelist.cc:382
msgid "DropNode called on still linked node"
-msgstr ""
+msgstr "\"DropNode\" pozvano nad još uvijek povezanim čvorom"
#: apt-inst/filelist.cc:414
msgid "Failed to locate the hash element!"
-msgstr ""
+msgstr "Ne mogu pronaći hash element!"
#: apt-inst/filelist.cc:461
msgid "Failed to allocate diversion"
-msgstr ""
+msgstr "Ne mogu alocirati preusmjeravanje"
#: apt-inst/filelist.cc:466
msgid "Internal error in AddDiversion"
-msgstr ""
+msgstr "Unutrašnja pogreška u \"AddDiversion\""
#: apt-inst/filelist.cc:479
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
+msgstr "Pokušavam zapisati preko preusmjeravanja, %s -> %s i %s/%s"
#: apt-inst/filelist.cc:508
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr ""
+msgstr "Dvostruko dodavanje preusmjeravanja %s -> %s"
#: apt-inst/filelist.cc:551
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr ""
+msgstr "Stvori duplikat konfiguracione datoteke %s/%s"
#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, fuzzy, c-format
@@ -1965,93 +2197,93 @@ msgstr "Ne mogu ukloniti %s"
#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
-msgstr ""
+msgstr "Ne mogu zatvoriti datoteku %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
-msgstr ""
+msgstr "Putanja %s je predugačka"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
-msgstr ""
+msgstr "Raspakujem %s više puta"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
-msgstr ""
+msgstr "Direktorij %s je preusmjeren"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
+msgstr "Paket pokušava zapisati na odredište preusmjeravanja %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
-msgstr ""
+msgstr "Putanja preusmjeravanja je predugačka"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
+msgstr "Direktorij %s se zamijenjuje komponentom koja nije direktorij"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
-msgstr ""
+msgstr "Ne mogu pronaći čvor u njegovoj hash ćeliji"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Putanja je preduga"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
-msgstr ""
+msgstr "Zapiši preko podudarnosti paketa bez verzije za %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
-msgstr ""
+msgstr "Datoteka %s/%s zapisuje preko jedne u paketu %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
-msgstr ""
+msgstr "Nisam u mogućnosti da ustanovim status %s"
#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
+msgstr "Ovo nije važeća DEB arhiva, nedostaje '%s' član"
#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
#: apt-inst/deb/debfile.cc:55
#, c-format
msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
+msgstr "Ovo nije važeća DEB arhiva, nema '%s', '%s' ili '%s' članova"
#: apt-inst/deb/debfile.cc:120
#, c-format
msgid "Internal error, could not locate member %s"
-msgstr ""
+msgstr "Interna greška, ne mogu da lociram člana %s"
#: apt-inst/deb/debfile.cc:214
msgid "Unparsable control file"
-msgstr ""
+msgstr "Neobradiva kontrolna datoteka"
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
-msgstr ""
+msgstr "Ne mogu mmap-irati praznu datoteku"
#: apt-pkg/contrib/mmap.cc:111
#, c-format
msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "Ne mogu duplicirati datotečni deskriptor %i"
#: apt-pkg/contrib/mmap.cc:119
#, c-format
msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Ne mogu napraviti mmap od %llu bajtova"
#: apt-pkg/contrib/mmap.cc:146
#, fuzzy
@@ -2066,7 +2298,7 @@ msgstr "Ne mogu kreirati %s"
#: apt-pkg/contrib/mmap.cc:290
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+msgstr "Ne mogu napraviti mmap %lu bita"
#: apt-pkg/contrib/mmap.cc:322
#, fuzzy
@@ -2079,6 +2311,8 @@ msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+"Dinamički MMap ostao bez prostora. Molim povećajte veličinu za APT::Cache-"
+"Start. Trenutna vrijednost: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:440
#, c-format
@@ -2086,369 +2320,360 @@ msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
+"Nije moguće povećati veličinu mmap jer je granica %lu bajtova je već "
+"postignuta."
#: apt-pkg/contrib/mmap.cc:443
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
+"Nije moguće povećati veličinu mmap jer je automatski rast onemogućen od "
+"strane korisnika."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
-msgstr ""
+msgstr "Izbor %s nije pronađen"
#: apt-pkg/contrib/configuration.cc:491
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr ""
+msgstr "Neprepoznat tip skraćenice: '%c'"
#: apt-pkg/contrib/configuration.cc:605
#, c-format
msgid "Opening configuration file %s"
-msgstr ""
+msgstr "Otvaram konfiguracijsku datoteku %s"
#: apt-pkg/contrib/configuration.cc:773
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
+msgstr "Greška u sintaksi %s:%u: Blok počinje bez imena."
#: apt-pkg/contrib/configuration.cc:792
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
+msgstr "Greška u sintaksi %s:%u: Deformiran tag"
#: apt-pkg/contrib/configuration.cc:809
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
+msgstr "Greška u sintaksi %s:%u: Višak nakon vrijednosti"
#: apt-pkg/contrib/configuration.cc:849
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
+"Greška u sintaksi %s:%u: Uputa moze biti izvršena samo na najvišem nivou"
#: apt-pkg/contrib/configuration.cc:856
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
+msgstr "Greška u sintaksi %s:%u: Previše nested-a uključeno"
#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr ""
+msgstr "Greška u sintaksi %s:%u: Uključena odavdje"
#: apt-pkg/contrib/configuration.cc:869
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr ""
+msgstr "Greška u sintaksi %s:%u: Nepodrzano uputstvo '%s'"
#: apt-pkg/contrib/configuration.cc:872
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
+"Sintaksna greška %s:%u: clear direktiva zahitjeva stablo opcija kao agument"
#: apt-pkg/contrib/configuration.cc:922
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr ""
+msgstr "Greška u sintaksi %s:%u: Višak na kraju datoteke"
#: apt-pkg/contrib/progress.cc:146
#, c-format
msgid "%c%s... Error!"
-msgstr ""
+msgstr "%c%s... Greška!"
#: apt-pkg/contrib/progress.cc:148
#, c-format
msgid "%c%s... Done"
-msgstr ""
-
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr ""
+msgstr "%c%s... Izvšeno"
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr ""
+msgstr "Opcija komandne linije '%c'[iz %s] nije poznata."
#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
#: apt-pkg/contrib/cmndline.cc:122
#, c-format
msgid "Command line option %s is not understood"
-msgstr ""
+msgstr "Opcija komandne linije %s je nerazumljiva"
#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
-msgstr ""
+msgstr "Opcija komandne linije %s nije bool"
#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
#, c-format
msgid "Option %s requires an argument."
-msgstr ""
+msgstr "Opcija %s zahtjeva argument"
#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
+msgstr "Opcija %s: Opisna stavka specifikacije mora imati an=<val>"
#: apt-pkg/contrib/cmndline.cc:237
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr ""
+msgstr "Opcija %s zahtijeva argument tipa integer, ne '%s'"
#: apt-pkg/contrib/cmndline.cc:268
#, c-format
msgid "Option '%s' is too long"
-msgstr ""
+msgstr "Opcija '%s' je preduga"
#: apt-pkg/contrib/cmndline.cc:300
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr ""
+msgstr "Značenje %s je nerazumljivo, probaj tačno ili netačno."
#: apt-pkg/contrib/cmndline.cc:350
#, c-format
msgid "Invalid operation %s"
-msgstr ""
+msgstr "Neispravna operacija %s"
#: apt-pkg/contrib/cdromutl.cc:56
#, c-format
msgid "Unable to stat the mount point %s"
-msgstr ""
+msgstr "Ne mogu da stat-ujem tačku montiranja %s"
#: apt-pkg/contrib/cdromutl.cc:224
msgid "Failed to stat the cdrom"
-msgstr ""
+msgstr "Ne mogu da stat-ujem cdrom"
#: apt-pkg/contrib/fileutl.cc:93
#, c-format
msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Problem u zatvaranju gzip datoteke %s"
#: apt-pkg/contrib/fileutl.cc:225
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr ""
+msgstr "Ne koristi se zaključavanje za čitanje zaključane datoteke %s"
#: apt-pkg/contrib/fileutl.cc:230
#, c-format
msgid "Could not open lock file %s"
-msgstr ""
+msgstr "Ne mogu otvoriti zaključanu datoteku %s"
#: apt-pkg/contrib/fileutl.cc:248
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
+msgstr "Ne koristi se zaključavanje za nfs montiranu zaključanu datoteku %s"
#: apt-pkg/contrib/fileutl.cc:252
#, c-format
msgid "Could not get lock %s"
-msgstr ""
+msgstr "Ne mogu zaključati %s"
#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "Lista datoteka se ne može kreirati kao '%s' nije direktorij"
#: apt-pkg/contrib/fileutl.cc:426
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "Ignorisan '%s' u direktoriju '%s' jer nije regularna datoteka"
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgstr "Ignorisana datoteka '%s' u direktoriju '%s' jer nema ekstenziju imena"
#: apt-pkg/contrib/fileutl.cc:453
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
+"Ignorisana datoteka '%s' u direktoriju '%s' jer ima nevažeću ekstenziju imena"
#: apt-pkg/contrib/fileutl.cc:840
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr ""
+msgstr "Sub- proces %s primio je grešku segmentacije"
#: apt-pkg/contrib/fileutl.cc:842
#, c-format
msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "Podproces %s primio signal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr ""
+msgstr "Sub-proces %s je vratio kod greške (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr ""
+msgstr "Sub-proces %s završen neočekivano"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
-msgstr ""
+msgstr "Ne mogu otvoriti datoteku %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
-msgstr ""
+msgstr "Nisam uspeo da napravim podprocesnu IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
-msgstr ""
+msgstr "Nisam uspeo da izvršim kompresorski program "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "čitam, još treba %llu pročitati ali ništa nije ostalo"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "pišem, još treba %llu pisati ali ne mobu"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Problem u preimenovanju datoteke %s u %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Problem u razvezivanju datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Odustajem od instalacije."
+msgstr "Problem u sinhronizaciji datoteke"
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
-msgstr ""
+msgstr "Prazan keš paket"
#: apt-pkg/pkgcache.cc:154
msgid "The package cache file is corrupted"
-msgstr ""
+msgstr "Keš paket datoteka je neispravna"
#: apt-pkg/pkgcache.cc:159
msgid "The package cache file is an incompatible version"
-msgstr ""
+msgstr "Keš paket datoteka je nekompatibilne verzije"
#: apt-pkg/pkgcache.cc:162
msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Priručno spremište paketa je oštećeno jer je suviše malo."
#: apt-pkg/pkgcache.cc:167
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr ""
+msgstr "Ovaj APT ne podržava verziju sistema '%s'"
#: apt-pkg/pkgcache.cc:172
msgid "The package cache was built for a different architecture"
-msgstr ""
+msgstr "Keš paket je napravljen za drukčiju arhitekturu"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Zavisi"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Unaprijed zavisi"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Predlaže"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Preporučuje"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
#, fuzzy
msgid "Conflicts"
msgstr "Sukobljava se sa"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Zamjenjuje"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Zastarijeva"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
-msgstr ""
+msgstr "Prekida"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
-msgstr ""
+msgstr "Poboljšava"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "važno"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "zahtijevano"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standardno"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opcionalno"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2482,62 +2707,64 @@ msgstr "Ne mogu ukloniti %s"
#: apt-pkg/tagfile.cc:129
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr ""
+msgstr "Ne mogu analizirati paketnu datoteku %s(1)"
#: apt-pkg/tagfile.cc:216
#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr ""
+msgstr "Ne mogu analizirati paketnu datoteku %s(2)"
#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "Loše formirana linija %lu u izvornoj listi %s ([option] neraščlanjiva)"
#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "Loše formirana linija %lu u izvornoj listi %s ([option] prekratka)"
#: apt-pkg/sourcelist.cc:110
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
+"Loše formirana linija %lu u izvornoj listi %s ([%s] nije dodjeljivanje)"
#: apt-pkg/sourcelist.cc:116
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "Loše formirana linija %lu u izvornoj listi %s ([%s] nema ključ)"
#: apt-pkg/sourcelist.cc:119
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
+"Loše formirana linija %lu u izvornoj listi %s ([%s] ključ %s nema vrijednost)"
#: apt-pkg/sourcelist.cc:132
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
+msgstr "Nepravilna linija %lu u source listi %s(URI)"
#: apt-pkg/sourcelist.cc:134
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
+msgstr "Nepravilna linija %lu u source listi %s(dist)"
#: apt-pkg/sourcelist.cc:137
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
+msgstr "Nepravilna linija %lu u source listi %s(URI analiza)"
#: apt-pkg/sourcelist.cc:143
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
+msgstr "Nepravilna linija %lu u source listi %s(apsolutni dist)"
#: apt-pkg/sourcelist.cc:150
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
+msgstr "Nepravilna linija %lu u source listi %s(dist analiza)"
#: apt-pkg/sourcelist.cc:248
#, c-format
@@ -2547,17 +2774,17 @@ msgstr "Otvaram %s"
#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
-msgstr ""
+msgstr "Linija %u preduga u source listi %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr ""
+msgstr "Nepravilna linija %u u source listi %s(tip)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
+msgstr "Tip '%s' je nepoznat u liniji %u u source listi %s"
#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898
#, c-format
@@ -2565,6 +2792,8 @@ msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Ne mogu obaviti neposrednu konfiguraciju na '%s'. Pogledajte man 5 apt.conf "
+"under APT::Immediate-Configure za detalje. (%d)"
#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
#, fuzzy, c-format
@@ -2578,43 +2807,51 @@ msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
+"Izvođenje ove instalacije će zahtjevati trenutno uklanjanje ključnog paketa "
+"%s zbog Conflicts/Pre.Depends petlje. Ovo je često loše, ali ako to stvarno "
+"želite učiniti, aktivirajte APT::Force-LoopBreak opciju."
#: apt-pkg/pkgrecords.cc:34
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr ""
+msgstr "Tip indexne datoteke '%s' nije podržan"
#: apt-pkg/algorithms.cc:266
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
+"Paket %s je potrebno reinstalirati, ali ne mogu da nađem arhivu za njega."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
+"Greška, pkgProblemResolver::Riješi nastale prekide, ovo može biti uzrokovano "
+"zadržanim paketima."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
+msgstr "Ne mogu riješiti probleme, čuvali ste neispravne pakete."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
msgstr ""
+"Neke datoteke indeksa nisu uspješno preuzete. One su ignorisane ili su stare "
+"korištene umjesto njih."
#: apt-pkg/acquire.cc:81
#, c-format
msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Listni direktorij %spartial nedostaje."
#: apt-pkg/acquire.cc:85
#, c-format
msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Arhivni direktorij %spartial nedostaje."
#: apt-pkg/acquire.cc:93
#, fuzzy, c-format
@@ -2626,7 +2863,7 @@ msgstr "Ne mogu kreirati %s"
#: apt-pkg/acquire.cc:893
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Povlačenje datoteke %li od %li (%s ostaje)"
#: apt-pkg/acquire.cc:895
#, fuzzy, c-format
@@ -2636,47 +2873,48 @@ msgstr "Čitam spisak datoteke"
#: apt-pkg/acquire-worker.cc:112
#, c-format
msgid "The method driver %s could not be found."
-msgstr ""
+msgstr "Metod dajver %s ne mogu da nađem."
#: apt-pkg/acquire-worker.cc:161
#, c-format
msgid "Method %s did not start correctly"
-msgstr ""
+msgstr "Metod %s nije startovan ispravno"
#: apt-pkg/acquire-worker.cc:440
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
+msgstr "Molim stavite disk sa obilježen: '%s' u disk '%s' i pritisnite enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr ""
+msgstr "Paketni sistem '%s' nije podržan"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
-msgstr ""
+msgstr "Ne mogu da odredim odgovarajući tip sistema za pakovanje"
#: apt-pkg/clean.cc:57
#, c-format
msgid "Unable to stat %s."
-msgstr ""
+msgstr "Nisam mogao pristupiti %s."
#: apt-pkg/srcrecords.cc:47
msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
+msgstr "Morate staviti neki 'izvorni' URI u vašu sources.list datoteku"
#: apt-pkg/cachefile.cc:87
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
+"Spiskovi paketa ili datoteka sa stanjem se ne može raščlaniti ili otvoriti."
#: apt-pkg/cachefile.cc:91
msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
+msgstr "Možda želite da pokrenete apt-get update da riješite ove probleme"
#: apt-pkg/cachefile.cc:109
msgid "The list of sources could not be read."
-msgstr ""
+msgstr "Ne mogu da pročitam listu izvora."
#: apt-pkg/policy.cc:75
#, c-format
@@ -2684,179 +2922,191 @@ msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"Vrijednost '%s' je nevažeća za APT::Default-Release pošto tog izdanja nema u "
+"izvornom kodu"
#: apt-pkg/policy.cc:399
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Nevažeći slog u datoteci postavki %s, nema zaglavlja paketa"
#: apt-pkg/policy.cc:421
#, c-format
msgid "Did not understand pin type %s"
-msgstr ""
+msgstr "Ne razumijem pin tipa %s"
#: apt-pkg/policy.cc:429
msgid "No priority (or zero) specified for pin"
-msgstr ""
+msgstr "Nema prioriteta (ili nula) specificiranog za pin"
#: apt-pkg/pkgcachegen.cc:87
msgid "Cache has an incompatible versioning system"
-msgstr ""
+msgstr "Keš ima nekompatibilan sistem za upravljanje verzijama"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Greška prilikom obrade %s (%s%d)"
#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
+msgstr "Premašili ste broj imena paketa koje ovaj APT dozvoljava."
#: apt-pkg/pkgcachegen.cc:254
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
+msgstr "Premašili ste broj verzija koje dozvoljava ovaj APT."
#: apt-pkg/pkgcachegen.cc:257
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "Premašili ste broj opisa koje dozvoljava ovaj APT."
#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
+msgstr "Premašili ste broj zavisnosti koje ovaj APT podržava."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
+msgstr "Paket %s %s nije pronađen tokom obrade zavisnosti datoteke"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr ""
+msgstr "Ne mogu da stat-am source paketnu listu %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Čitam spiskove paketa"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
-msgstr ""
+msgstr "Skupljam datotečne usluge"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
-msgstr ""
+msgstr "UI Greška u spašavanju source keša"
#: apt-pkg/acquire-item.cc:139
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr ""
+msgstr "preimenovanje neuspjelo, %s(%s->%s)."
#: apt-pkg/acquire-item.cc:599
msgid "MD5Sum mismatch"
-msgstr ""
+msgstr "MD5Sum se ne poklapa"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
-msgstr ""
+msgstr "Hash Sum se ne poklapa"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"Ne mogu naći očekivani unos '%s' u Release datoteci (Pogrešan red u sources."
+"list ili loše formirana datoteka)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
+msgstr "Javni ključ nije dostupan za sljedeće ID-ove ključeva:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"Datoteka izdanja za %s je istekla (nevažeća nakon %s). Nadogradnje za ovaj "
+"repozitorij neće biti primijenjene."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "Konfliknta distribucija: %s (očekivano %s ali dobijeno %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
+"Došlo je do pogreške tijekom provjere potpisa. Repozitorij nije ažuriran i "
+"prethodna indeks datoteka će se koristiti. GPG greškar:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "GPG greška: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, 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 ""
+"Nisam mogao da pronađem datoteku za paket %s. Možda ćete morati ručno da "
+"popravljate ovaj problem. (zbog arch-a koji nedostaje)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, 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."
msgstr ""
+"Nisam mogao naći datoteku za %s paket. To možda znači da ga morate ručno "
+"popraviti."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
+msgstr "Indeksne datoteke su oštećene. Nema imena datoteka: polje za paket %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
-msgstr ""
+msgstr "Veličina se ne poklapa"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Nema sekcija u datoteci izdanja %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Nema Hash elemenata u datoteci izdanja %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Nevažeći 'Valid-Until' u datoteci izdanja %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ne mogu otvoriti DB datoteku %s"
@@ -2864,7 +3114,7 @@ msgstr "Ne mogu otvoriti DB datoteku %s"
#: apt-pkg/vendorlist.cc:78
#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr ""
+msgstr "Glavni blok %s ne sadrži otiske"
#: apt-pkg/cdrom.cc:576
#, c-format
@@ -2872,15 +3122,17 @@ msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
+"Koristim CD-ROM-ovu tačku montiranja %s\n"
+"Montiram CD-ROM\n"
#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
msgid "Identifying.. "
-msgstr ""
+msgstr "Identificiram.. "
#: apt-pkg/cdrom.cc:613
#, c-format
msgid "Stored label: %s\n"
-msgstr ""
+msgstr "Spremljena labela: %s\n"
#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
#, fuzzy
@@ -2890,11 +3142,11 @@ msgstr "Pogrešan CD"
#: apt-pkg/cdrom.cc:642
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr ""
+msgstr "Koristim tačku montiranja CD-ROM-a %s\n"
#: apt-pkg/cdrom.cc:660
msgid "Unmounting CD-ROM\n"
-msgstr ""
+msgstr "Demontiram CD-ROM\n"
#: apt-pkg/cdrom.cc:665
#, fuzzy
@@ -2903,11 +3155,11 @@ msgstr "Čekam na zaglavlja"
#: apt-pkg/cdrom.cc:674
msgid "Mounting CD-ROM...\n"
-msgstr ""
+msgstr "Montiram CD-ROM...\n"
#: apt-pkg/cdrom.cc:693
msgid "Scanning disc for index files..\n"
-msgstr ""
+msgstr "Skeniram disk za indeksne datoteke..\n"
#: apt-pkg/cdrom.cc:744
#, c-format
@@ -2915,21 +3167,25 @@ msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
+"Nađeno %zu indeksa paketa, %zu izvornih indeksa, %zu prevodilačkih indeksa i "
+"%zu potpisa\n"
#: apt-pkg/cdrom.cc:755
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"Ne mogu pronaći datoteku paketa, možda to nije Debian disk ili je pogrešne "
+"arhitekture?"
#: apt-pkg/cdrom.cc:782
#, c-format
msgid "Found label '%s'\n"
-msgstr ""
+msgstr "Nađena labela '%s'\n"
#: apt-pkg/cdrom.cc:811
msgid "That is not a valid name, try again.\n"
-msgstr ""
+msgstr "Ovo nije ispravno ime, probajte ponovo.\n"
#: apt-pkg/cdrom.cc:828
#, c-format
@@ -2937,6 +3193,8 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
+"Ovaj disk je nazvan:\n"
+"'%s'\n"
#: apt-pkg/cdrom.cc:830
#, fuzzy
@@ -2945,51 +3203,64 @@ msgstr "Čitam spiskove paketa"
#: apt-pkg/cdrom.cc:857
msgid "Writing new source list\n"
-msgstr ""
+msgstr "pišem novu source listu\n"
#: apt-pkg/cdrom.cc:865
msgid "Source list entries for this disc are:\n"
-msgstr ""
+msgstr "Source lista ulaza za disk je:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
-msgstr ""
+msgstr "Napisano %i zapisa.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+msgstr "Napisano %i zapisa sa %i datoteka koje nedostaju.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+msgstr "Napisano %i zapisa sa %i neodgovarajućih datoteka\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+"Napisano %i zapisa sa %i datoteka koje nedostaju i %i neodgovarajućih "
+"datoteka\n"
#: apt-pkg/indexcopy.cc:515
#, c-format
msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "Ne mogu naći slog autentifikacije za: %s"
#: apt-pkg/indexcopy.cc:521
#, c-format
msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Hash neslaganje za: %s"
+
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Datoteka %s ne počinje ispravno potpisanom porukom"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Odustajem od instalacije."
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr ""
+msgstr "Nije pronađeno izdanje „%s“ za „%s“."
#: apt-pkg/cacheset.cc:406
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr ""
+msgstr "Nije pronađena verzija „%s“ za „%s“"
#: apt-pkg/cacheset.cc:517
#, fuzzy, c-format
@@ -2999,12 +3270,12 @@ msgstr "Ne mogu otvoriti %s"
#: apt-pkg/cacheset.cc:523
#, c-format
msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Ne mogu naći paket regularnim izrazom '%s'"
#: apt-pkg/cacheset.cc:534
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgstr "Ne mogu odabrati verzije iz paketa '%s' jer je čisto virtualan"
#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
#, c-format
@@ -3012,166 +3283,187 @@ msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
+"Ne mogu odabrati instaliranu niti kandidatsku verziju iz paketa '%s' jer "
+"nije nijedna od njih"
#: apt-pkg/cacheset.cc:555
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
+"Ne mogu odabrati najnoviju verziju iz paketa '%s' jer je čisto virtuelna"
#: apt-pkg/cacheset.cc:563
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgstr "Ne mogu odabrati kandidatsku verziju iz paketa %s jer nema kandidata"
#: apt-pkg/cacheset.cc:571
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgstr "Ne mogu odabrati instaliranu verziju iz paketa %s jer nije instaliran"
#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
msgid "Send scenario to solver"
-msgstr ""
+msgstr "Slanje scenarija rješavaču"
#: apt-pkg/edsp.cc:209
msgid "Send request to solver"
-msgstr ""
+msgstr "Slanje zahtjeva rješavaču"
#: apt-pkg/edsp.cc:279
msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Priprema za prijem rješenja"
#: apt-pkg/edsp.cc:286
msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "Spoljnji razrješivač pao bez odgovarajuće poruke o grešci"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
-msgstr ""
+msgstr "Izvršenje spoljnjeg razrješivača"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Instalirano:"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Povezujem se sa %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "Zabilježen nestanak %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
-msgstr ""
+msgstr "Pokrećem post-instalacijski okidač %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
-msgstr ""
+msgstr "Direktorij '%s' nedostaje"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Otvaram %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
-msgstr ""
+msgstr "Pripremam se za konfiguraciju %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Instalirano:"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Pripremam za uklanjanje %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Preporučuje"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
-msgstr ""
+msgstr "Pripremam da u potpunosti uklonim %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+"Ne mogu da napišem izvještaj, openpty() neuspjela (/dev/pts nije "
+"montirana?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
-msgstr ""
+msgstr "Pokrećem dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "Operacija je prekinuta prije nego se mogla završiti"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
+"Nije napravljen apport izvještaj jer je dosegnut maksimalni broj izvještaja"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "problemi sa međuzavisnostima - ostavljam nekonfigurisano"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
+"Nije napravljen apport izvještaj jer poruka greške indicira da je prateća "
+"greška od prethodnog neuspjeha"
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
+"Nije napravljen apport izvještaj jer poruka greške indicira grešku punog "
+"diska"
#: apt-pkg/deb/dpkgpm.cc:1496
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
+"Nije napravljen apport izvještaj jer poruka greške indicira grešku "
+"nedostatka memorije"
+
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nema apport izvještaja napisanog jer greška indicira problem na lokalnom "
+"sistemu"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
+"Nije napravljen apport izvještaj jer poruka greške indicira dpkg I/O grešku"
#: apt-pkg/deb/debsystem.cc:84
#, c-format
@@ -3179,11 +3471,13 @@ msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
+"Ne mogu zaključati administracijski direktorij (%s), da li ga drugi proces "
+"koristi?"
#: apt-pkg/deb/debsystem.cc:87
#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Ne mogu zaključati administracijski direktorij (%s), da li ste root?"
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
@@ -3191,11 +3485,11 @@ msgstr ""
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
+msgstr "dpkg je prekinut morate ručno pokrenuti '%s' da popravite problem. "
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
-msgstr ""
+msgstr "Nije zaključano"
#~ msgid "Failed to remove %s"
#~ msgstr "Ne mogu ukloniti %s"
diff --git a/po/ca.po b/po/ca.po
index 2bfee4717..1e7fb549c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-10-19 13:30+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " Taula de versió:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -639,7 +639,7 @@ msgstr "Avortat."
msgid "Do you want to continue [Y/n]? "
msgstr "Voleu continuar [S/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
@@ -835,7 +835,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "S'està calculant l'actualització… "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Ha fallat"
@@ -1039,11 +1039,11 @@ msgstr "No es poden processar les dependències de construcció"
msgid "Changelog for %s (%s)"
msgstr "Registre de canvis per a %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1135,7 +1135,7 @@ msgstr ""
"per a obtenir més informació i opcions.\n"
" Aquest APT té superpoders bovins.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1210,8 +1210,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ja estava no retingut.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
@@ -1251,6 +1250,26 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
+"Forma d'ús: apt-mark [opcions] {auto|manual} paq1 [paq2 …]\n"
+"\n"
+"apt-mark és una interfície simple de la línia d'ordres per a marcar\n"
+"paquets com a instaŀlats automàticament o manual. També pot llistar\n"
+"les marques.\n"
+"\n"
+"Ordres:\n"
+"\n"
+" auto - Marca els paquets donats com a instaŀlats automàticament\n"
+" manual - Marca els paquets donats com a instaŀlats manualment\n"
+"\n"
+"Opcions:\n"
+" -h Aquest text d'ajuda.\n"
+" -q Sortida enregistrable - sense indicador de progrés\n"
+" -qq Sense sortida, llevat dels errors\n"
+" -s No actues. Mostra només què es faria.\n"
+" -f Llegeix/escriu les marques auto/manual emprant el fitxer donat\n"
+" -c=? Llegeix aquest fitxer de configuració\n"
+" -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n"
+"Vegeu les pàgines de manual apt-mark(8) i apt.conf(5) per a més informació."
#: methods/cdrom.cc:203
#, c-format
@@ -1349,8 +1368,8 @@ msgstr "Temps de connexió finalitzat"
msgid "Server closed the connection"
msgstr "El servidor ha tancat la connexió"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Error de lectura"
@@ -1363,8 +1382,8 @@ msgid "Protocol corruption"
msgstr "Protocol corromput"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Error d'escriptura"
@@ -1419,7 +1438,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:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1446,94 +1465,89 @@ msgstr "Consulta"
msgid "Unable to invoke "
msgstr "No es pot invocar"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "S'està connectant amb %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "No es pot iniciar la connexió amb %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "No s'ha pogut connectar amb %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "S'està connectant amb %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "No s'ha pogut resoldre «%s»"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "S'ha produït un error temporal en resoldre «%s»"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "No es pot connectar amb %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error intern: La signatura és correcta, però no s'ha pogut determinar "
"l'emprempta digital de la clau!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "S'ha trobat almenys una signatura invàlida."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"No s'ha pogut executar el «gpgv» per a verificar la signatura (està "
"instaŀlat el gpgv?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "S'ha produït un error desconegut en executar el gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Les signatures següents són invàlides:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1573,54 +1587,54 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat"
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "S'ha produït un error en escriure al fitxer de sortida"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "S'ha produït un error en escriure al fitxer"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "S'ha produït un error en escriure al fitxer"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"S'ha produït un error en llegir, el servidor remot ha tancat la connexió"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "S'ha produït un error en llegir des del servidor"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Error intern"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "No es pot llegir %s"
@@ -1746,7 +1760,7 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "No es pot escriure en %s"
@@ -1892,8 +1906,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "No es pot obrir el fitxer de DB %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "No es pot determinar l'estat de %s"
@@ -1906,87 +1920,87 @@ msgstr "Arxiu sense registre de control"
msgid "Unable to get a cursor"
msgstr "No es pot aconseguir un cursor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No es pot llegir el directori %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No es pot veure l'estat %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Els errors s'apliquen al fitxer "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "No s'ha pogut resoldre %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "L'arbre està fallant"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "No s'ha pogut obrir %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "No s'ha pogut llegir l'enllaç %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "No s'ha pogut alliberar %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No s'ha pogut enllaçar %s a %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink s'ha arribat al límit de %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no té una entrada dominant\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no té una entrada dominant de font\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s no té una entrada dominant de binari\n"
@@ -2060,7 +2074,7 @@ msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
msgid "Problem unlinking %s"
msgstr "S'ha trobat un problema treient l'enllaç %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "No s'ha pogut canviar el nom de %s a %s"
@@ -2205,54 +2219,54 @@ msgstr "No s'ha pogut escriure el fitxer %s"
msgid "Failed to close file %s"
msgstr "Ha fallat el tancament del fitxer %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "La ruta %s és massa llarga"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "S'està desempaquetant %s més d'una vegada"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "El directori %s està desviat"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "La ruta de desviació és massa llarga"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "El directori %s està sent reemplaçat per un no-directori"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "No s'ha trobat el node dins de la taula"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "La ruta és massa llarga"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "No es pot veure l'estat de %s"
@@ -2334,30 +2348,30 @@ msgstr ""
"està deshabilitat per l'usuari."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "No s'ha trobat la selecció %s"
@@ -2429,16 +2443,6 @@ msgstr "%c%s… Error!"
msgid "%c%s... Done"
msgstr "%c%s… Fet"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "…"
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s… %u%%"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2555,69 +2559,63 @@ msgstr "El sub-procés %s ha rebut una violació de segment."
msgid "Sub-process %s received signal %u."
msgstr "El sub-procés %s ha rebut un senyal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El sub-procés %s ha retornat un codi d'error (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El sub-procés %s ha sortit inesperadament"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "No s'ha pogut obrir el fitxer %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "No s'ha pogut obrir el descriptor del fitxer %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "No s'ha pogut crear el subprocés IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "No s'ha pogut executar el compressor "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "llegits, falten %llu per llegir, però no queda res"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "escrits, falten %llu per escriure però no s'ha pogut"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Ha hagut un problema en tancar el fitxer %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Ha hagut un problema en sincronitzar el fitxer"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No s'ha instaŀlat cap clauer a %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Memòria cau de paquets és buida"
@@ -2643,59 +2641,59 @@ msgstr "Aquest APT no suporta el sistema de versions «%s»"
msgid "The package cache was built for a different architecture"
msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Depèn"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Predepèn"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Suggereix"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Recomana"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Entra en conflicte"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Reemplaça"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Fa obsolet"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Trenca"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Millora"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "important"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "requerit"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "estàndard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2798,12 +2796,12 @@ msgstr "S'està obrint %s"
msgid "Line %u too long in source list %s."
msgstr "La línia %u és massa llarga en la llista de fonts %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
@@ -2846,7 +2844,7 @@ msgid ""
msgstr ""
"El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2854,13 +2852,13 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
"causat per paquets retinguts."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No es poden corregir els problemes, teniu paquets retinguts que estan "
"trencats."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2910,12 +2908,12 @@ msgstr "El mètode %s no s'ha iniciat correctament"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema d'empaquetament «%s» no està suportat"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
@@ -2972,14 +2970,14 @@ msgstr "La memòria cau té un sistema de versions incompatible"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "S'ha produït un error en processar %s (%s%d)"
@@ -3006,27 +3004,27 @@ msgstr ""
"Uau, heu excedit el nombre de dependències que aquest APT és capaç de "
"gestionar."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No s'ha pogut llegir la llista de paquets font %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "S'està llegint la llista de paquets"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "S'estan recollint els fitxers que proveeixen"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Error d'E/S en desar la memòria cau de la font"
@@ -3039,12 +3037,12 @@ msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "La suma MD5 no concorda"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "La suma resum no concorda"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3053,16 +3051,16 @@ msgstr ""
"No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia "
"al sources.list o fitxer malformat)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3071,15 +3069,15 @@ msgstr ""
"El fitxer Release per a %s ha caducat (invàlid des de %s). Les "
"actualitzacions per a aquest dipòsit no s'aplicaran."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"S'ha produït un error durant la verificació de la signatura. El dipòsit no "
@@ -3087,12 +3085,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "S'ha produït un error amb el GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3102,7 +3100,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3111,7 +3109,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:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3119,31 +3117,31 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "La mida no concorda"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "No es pot analitzar el fitxer Release %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "No hi ha seccions al fitxer Release %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "No hi ha una entrada Hash al fitxer Release %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "El camp «Date» al fitxer Release %s és invàlid"
@@ -3243,22 +3241,22 @@ msgstr "S'està escrivint una nova llista de fonts\n"
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/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "S'han escrit %i registres.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3275,6 +3273,17 @@ msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
msgid "Hash mismatch for: %s"
msgstr "El resum no coincideix per a: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "El fitxer %s no comença amb un missatge signat en clar"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No s'ha instaŀlat cap clauer a %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3348,115 +3357,115 @@ msgstr "Prepara per a rebre una solució"
msgid "External solver failed without a proper error message"
msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Executa un resoledor extern"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "S'està instaŀlant %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "S'està configurant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "S'està suprimint el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "S'ha suprimit completament %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "S'està anotant la desaparició de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "S'està executant l'activador de postinstaŀlació %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Manca el directori «%s»"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "No s'ha pogut obrir el fitxer «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "S'està preparant el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "S'està desempaquetant %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "S'està preparant per a configurar el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "S'ha instaŀlat el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "S'està preparant per a la supressió del paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "S'ha suprimit el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "S'està preparant per a suprimir completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "S'ha suprimit completament el paquet %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
"pts?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "S'està executant dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "S'ha interromput l'operació abans que pogués finalitzar"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "S'han produït problemes de depències, es deixa sense configurar"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3464,7 +3473,7 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
"consequent de una fallida anterior."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3480,7 +3489,13 @@ msgstr ""
"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
"falta de memòria"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3515,8 +3530,23 @@ msgstr ""
msgid "Not locked"
msgstr "No blocat"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "El fitxer %s no comença amb un missatge signat en clar"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
+
+#~ msgid "..."
+#~ msgstr "…"
+
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s… %u%%"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "S'ha produït un error durant la verificació de la signatura. El dipòsit "
+#~ "no està actualitzat i s'emprarà el fitxer d'índex anterior. Error del "
+#~ "GPG: %s: %s\n"
#~ msgid "decompressor"
#~ msgstr "decompressor"
diff --git a/po/cs.po b/po/cs.po
index 4064c164b..993e105f3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-07-08 13:46+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -153,7 +153,7 @@ msgid " Version table:"
msgstr " Tabulka verzí:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -626,7 +626,7 @@ msgstr "Přerušeno."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -823,7 +823,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci… "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Selhalo"
@@ -1019,11 +1019,11 @@ msgstr "Chyba při zpracování závislostí pro sestavení"
msgid "Changelog for %s (%s)"
msgstr "Seznam změn %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1110,7 +1110,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tato APT má schopnosti svaté krávy.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1185,8 +1185,7 @@ msgid "%s was already not hold.\n"
msgstr "%s již nebyl držen v aktuální verzi.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čekal jsem na %s, ale nebyl tam"
@@ -1342,8 +1341,8 @@ msgstr "Čas spojení vypršel"
msgid "Server closed the connection"
msgstr "Server uzavřel spojení"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Chyba čtení"
@@ -1356,8 +1355,8 @@ msgid "Protocol corruption"
msgstr "Porušení protokolu"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Chyba zápisu"
@@ -1411,7 +1410,7 @@ msgstr "Spojení datového socketu vypršelo"
msgid "Unable to accept connection"
msgstr "Nelze přijmout spojení"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problém s kontrolním součtem souboru"
@@ -1438,90 +1437,85 @@ msgstr "Dotaz"
msgid "Unable to invoke "
msgstr "Nelze vyvolat "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Připojuji se k %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nelze vytvořit socket pro %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nelze navázat spojení na %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nelze se připojit k %s:%s (%s), čas spojení vypršel"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nelze se připojit k %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Připojuji se k %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nelze přeložit „%s“"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Dočasné selhání při zjišťování „%s“"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nelze se připojit k %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Neznámá chyba při spouštění gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Následující podpisy jsou neplatné:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1561,53 +1555,53 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů"
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Vnitřní chyba"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Nelze číst %s"
@@ -1727,7 +1721,7 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Nelze zapsat do %s"
@@ -1872,8 +1866,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Nelze otevřít DB soubor %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Nelze vyhodnotit %s"
@@ -1886,87 +1880,87 @@ msgstr "Archiv nemá kontrolní záznam"
msgid "Unable to get a cursor"
msgstr "Nelze získat kurzor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nelze číst adresář %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nelze vyhodnotit %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Chyby se týkají souboru "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba při zjišťování %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Průchod stromem selhal"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Nelze otevřít %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Odlinkování %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Nelze přečíst link %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Nelze odlinkovat %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nezdařilo se slinkovat %s s %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Odlinkovací limit %sB dosažen.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Archiv nemá pole Package"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žádnou položku pro override\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žádnou zdrojovou položku pro override\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá ani žádnou binární položku pro override\n"
@@ -2040,7 +2034,7 @@ msgstr "Chyba čtení při výpočtu MD5"
msgid "Problem unlinking %s"
msgstr "Problém s odlinkováním %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Selhalo přejmenování %s na %s"
@@ -2184,54 +2178,54 @@ msgstr "Selhal zápis souboru %s"
msgid "Failed to close file %s"
msgstr "Selhalo zavření souboru %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Cesta %s je příliš dlouhá"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Rozbaluji %s vícekrát"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Adresář %s je odkloněn"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Diverzní cesta je příliš dlouhá"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Adresář %s bude nahrazen neadresářem"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Nelze nalézt uzel v jeho hashovacím kbelíku"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Cesta je příliš dlouhá"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Přepsat vyhovující balík bez udání verze pro %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Soubor %s/%s přepisuje ten z balíku %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Nelze vyhodnotit %s"
@@ -2311,30 +2305,30 @@ msgstr ""
"zakázáno."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
@@ -2407,16 +2401,6 @@ msgstr "%c%s… Chyba!"
msgid "%c%s... Done"
msgstr "%c%s… Hotovo"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "…"
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s… %u%%"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2528,69 +2512,63 @@ msgstr "Podproces %s obdržel chybu segmentace."
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s obdržel signál %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s vrátil chybový kód (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočekávaně skončil"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Nelze otevřít soubor %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Nelze otevřít popisovač souboru %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Nelze vytvořit podproces IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Nezdařilo se spustit kompresor "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "čtení, stále mám k přečtení %llu, ale už nic nezbývá"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "zápis, stále mám %llu k zápisu, ale nejde to"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problém při zavírání souboru %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problém při přejmenování souboru %s na %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problém při odstraňování souboru %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problém při synchronizování souboru"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s není nainstalována žádná klíčenka."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache balíků je prázdná"
@@ -2616,59 +2594,59 @@ msgstr "Tato APT nepodporuje systém pro správu verzí „%s“"
msgid "The package cache was built for a different architecture"
msgstr "Cache balíků byla vytvořena pro jinou architekturu"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Závisí na"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Předzávisí na"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Navrhuje"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Doporučuje"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Koliduje s"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Nahrazuje"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Zastarává"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Porušuje"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Rozšiřuje"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "důležitý"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "vyžadovaný"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standardní"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "volitelný"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2768,12 +2746,12 @@ msgstr "Otevírám %s"
msgid "Line %u too long in source list %s."
msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
@@ -2814,7 +2792,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:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2822,11 +2800,11 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
"podrženými balíky."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2876,12 +2854,12 @@ msgstr "Metoda %s nebyla spuštěna správně"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Balíčkovací systém „%s“ není podporován"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
@@ -2937,14 +2915,14 @@ msgstr "Cache má nekompatibilní systém správy verzí"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Chyba při zpracování %s (%s%d)"
@@ -2965,26 +2943,26 @@ msgstr "Wow, překročili jste počet popisů, které tato APT umí zpracovat."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Wow, překročili jste počet závislostí, které tato APT umí zpracovat."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Při zpracování závislostí nebyl nalezen balík %s %s"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Čtu seznamy balíků"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Chyba IO při ukládání zdrojové cache"
@@ -2997,12 +2975,12 @@ msgstr "přejmenování selhalo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Neshoda kontrolních součtů"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3011,16 +2989,16 @@ msgstr ""
"V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list "
"nebo porušený soubor)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "V souboru Release nelze najít kontrolní součet „%s“"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3029,27 +3007,27 @@ msgstr ""
"Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
"repositáře se nepoužijí."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Při ověřování podpisů se objevila chyba. Repositář není aktualizovaný, tudíž "
"se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3058,7 +3036,7 @@ msgstr ""
"Nebylo možné 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:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3067,38 +3045,38 @@ msgstr ""
"Nebylo možné nalézt soubor s balíkem %s. Asi budete muset tento balík "
"opravit ručně."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, 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:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nelze zpracovat Release soubor %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Release soubor %s neobsahuje žádné sekce"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release soubor %s neobsahuje Hash záznam"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Neplatná položka „Valid-Until“ v Release souboru %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Neplatná položka „Date“ v Release souboru %s"
@@ -3198,22 +3176,22 @@ msgstr "Zapisuji nový seznam balíků\n"
msgid "Source list entries for this disc are:\n"
msgstr "Seznamy zdrojů na tomto disku jsou:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapsáno %i záznamů.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapsáno %i záznamů s chybějícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapsáno %i záznamů s nesouhlasícími soubory (%i).\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapsáno %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
@@ -3228,6 +3206,17 @@ msgstr "Nelze najít autentizační záznam pro: %s"
msgid "Hash mismatch for: %s"
msgstr "Neshoda kontrolních součtů pro: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Soubor %s nezačíná podpisem"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s není nainstalována žádná klíčenka."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3293,114 +3282,114 @@ msgstr "Příprava na obdržení řešení"
msgid "External solver failed without a proper error message"
msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Spuštění externího řešitele"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instaluji %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Nastavuji %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Odstraňuji %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Kompletně odstraňuji %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Značím si zmizení %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Spouštím poinstalační spouštěč %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Adresář „%s“ chybí"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Nelze otevřít soubor „%s“"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Připravuji %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaluji %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Připravuji nastavení %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Nainstalován %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Připravuji odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Připravuji úplné odstranění %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Kompletně odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Spouštím dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Operace byla přerušena dříve, než mohla skončit"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3408,7 +3397,7 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"se jedná o chybu způsobenou předchozí chybou."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3424,7 +3413,13 @@ msgstr ""
"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
"je chyba způsobena zcela zaplněnou pamětí."
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3455,8 +3450,22 @@ msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%
msgid "Not locked"
msgstr "Není uzamčen"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Soubor %s nezačíná podpisem"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)"
+
+#~ msgid "..."
+#~ msgstr "…"
+
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s… %u%%"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Při ověřování podpisů se objevila chyba. Repositář není aktualizovaný, "
+#~ "tudíž se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Přeskakuji neexistující soubor %s"
diff --git a/po/cy.po b/po/cy.po
index c1867d70a..e23ab97a5 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+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"
@@ -172,7 +172,7 @@ msgid " Version table:"
msgstr " Tabl Fersiynnau:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -663,7 +663,7 @@ msgstr "Erthylu."
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
@@ -852,7 +852,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Methwyd"
@@ -1044,13 +1044,13 @@ msgstr "Methwyd prosesu dibyniaethau adeiladu"
msgid "Changelog for %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1137,7 +1137,7 @@ msgstr ""
"\n"
" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1208,8 +1208,7 @@ msgid "%s was already not hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
@@ -1352,8 +1351,8 @@ msgstr "Goramser cysylltu"
msgid "Server closed the connection"
msgstr "Caeodd y gweinydd y cysylltiad"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Gwall darllen"
@@ -1366,8 +1365,8 @@ msgid "Protocol corruption"
msgstr "Llygr protocol"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Gwall ysgrifennu"
@@ -1423,7 +1422,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -1451,91 +1450,86 @@ msgstr "Ymholiad"
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Methwyd cysylltu i %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Yn cysylltu i %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Methwyd datrys '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Methiant dros dro yn datrys '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Methwyd cysylltu i %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1577,55 +1571,55 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:923
+#: methods/http.cc:919
#, 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:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Gwall mewnol"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
@@ -1749,7 +1743,7 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
@@ -1895,8 +1889,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Methodd stat() o %s"
@@ -1909,88 +1903,88 @@ msgstr "Does dim cofnod rheoli gan yr archif"
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "G: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "Rh: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Methwyd datrys %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Methwyd cerdded y goeden"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Methwyd agor %s"
# FIXME
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DatGysylltu %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Methwyd darllen y cyswllt %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Methwyd datgysylltu %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Methwyd cysylltu %s at %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
@@ -2065,7 +2059,7 @@ msgstr "Methwyd darllen wrth gyfrifo MD5"
msgid "Problem unlinking %s"
msgstr "Gwall wrth datgysylltu %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
@@ -2215,56 +2209,56 @@ msgstr "Methwyd ysgrifennu ffeil %s"
msgid "Failed to close file %s"
msgstr "Methwyd cau ffeil %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Mae'r llwybr %s yn rhy hir"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Yn dadbacio %s mwy nag unwaith"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr ""
"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Mae'r llwybr yn rhy hir"
# FIXME: wtf?
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Ni ellir gwneud stat() o %s"
@@ -2345,30 +2339,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
@@ -2441,16 +2435,6 @@ msgstr "%c%s... Gwall!"
msgid "%c%s... Done"
msgstr "%c%s... Wedi Gorffen"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Wedi Gorffen"
-
# FIXME
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
@@ -2564,71 +2548,65 @@ msgstr "Derbyniodd is-broses %s wall segmentu."
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Methwyd agor pibell ar gyfer %s"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Methwyd creu isbroses IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Methwyd gweithredu cywasgydd "
# FIXME
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "o hyd %lu i ddarllen ond dim ar ôl"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
@@ -2656,59 +2634,59 @@ msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
msgid "The package cache was built for a different architecture"
msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Dibynnu"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "CynDdibynnu"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Awgrymu"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Argymell"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Gwrthdaro"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Amnewid"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Darfodi"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "pwysig"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "angenrheidiol"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "safonnol"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opsiynnol"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "ychwanegol"
@@ -2818,12 +2796,12 @@ msgstr "Yn agor %s"
msgid "Line %u too long in source list %s."
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
@@ -2865,7 +2843,7 @@ msgstr ""
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2873,12 +2851,12 @@ msgstr ""
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2932,12 +2910,12 @@ msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Ni chynhelir y system pecynnu '%s'"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
#, fuzzy
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
@@ -2994,14 +2972,14 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
@@ -3025,27 +3003,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
#, fuzzy
msgid "Reading package lists"
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
@@ -3058,13 +3036,13 @@ msgstr "methwyd ailenwi, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3072,42 +3050,42 @@ msgid ""
msgstr ""
# FIXME: number?
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3116,7 +3094,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:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3125,40 +3103,40 @@ 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:1759
+#: apt-pkg/acquire-item.cc:1764
#, 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:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
# FIXME: number?
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
# FIXME: number?
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
@@ -3254,22 +3232,22 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3284,6 +3262,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Camgyfatebiaeth swm MD5"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Yn Erthylu'r Sefydliad."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3347,119 +3336,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Yn cysylltu i %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3471,7 +3460,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3501,6 +3496,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Wedi Gorffen"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Yn agor y ffeil cyfluniad %s"
diff --git a/po/da.po b/po/da.po
index e2982b563..898fa6d5d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-07-03 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " Versionstabel:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -635,7 +635,7 @@ msgstr "Afbryder."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsætte [J/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -829,7 +829,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Mislykkedes"
@@ -1024,11 +1024,11 @@ msgstr "Kunne ikke behandler opbygningsafhængighederne"
msgid "Changelog for %s (%s)"
msgstr "Ændringslog for %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Understøttede moduler:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1116,7 +1116,7 @@ msgstr ""
"for flere oplysninger og tilvalg.\n"
" Denne APT har »Super Cow Powers«.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1191,8 +1191,7 @@ msgid "%s was already not hold.\n"
msgstr "%s var allerede ikke i bero.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventede på %s, men den var der ikke"
@@ -1350,8 +1349,8 @@ msgstr "Tidsudløb på forbindelsen"
msgid "Server closed the connection"
msgstr "Serveren lukkede forbindelsen"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Læsefejl"
@@ -1364,8 +1363,8 @@ msgid "Protocol corruption"
msgstr "Protokolfejl"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Skrivefejl"
@@ -1419,7 +1418,7 @@ msgstr "Tidsudløb på datasokkel-forbindelse"
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1446,92 +1445,87 @@ msgstr "Forespørgsel"
msgid "Unable to invoke "
msgstr "Kunne ikke udføre "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Forbinder til %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudløb"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kunne ikke forbinde til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Forbinder til %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kunne ikke omsætte navnet '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Midlertidig fejl ved omsætning af navnet '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Kunne ikke forbinde til %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Stødte på mindst én ugyldig signatur."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Kunne ikke køre 'gpgv' for at verificere signaturen (er gpgv installeret?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Ukendt fejl ved kørsel af gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Følgende signaturer var ugyldige:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1572,53 +1566,53 @@ msgstr ""
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Tidsudløb på forbindelsen"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Fejl ved læsning fra server"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Intern fejl"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Kunne ikke læse %s"
@@ -1744,7 +1738,7 @@ msgstr ""
" -c=? Læs denne opsætningsfil\n"
" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Kunne ikke skrive til %s"
@@ -1889,8 +1883,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Kunne ikke åbne DB-filen %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Kunne ikke finde %s"
@@ -1903,87 +1897,87 @@ msgstr "Arkivet har ingen kontrolindgang"
msgid "Unable to get a cursor"
msgstr "Kunne skaffe en markør"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Kunne ikke læse mappen %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kunne ikke finde %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "F: Fejlene vedrører filen "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Kunne ikke omsætte navnet %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Trævandring mislykkedes"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Kunne ikke åbne %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Kunne ikke »readlink« %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Kunne ikke frigøre %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Kunne ikke lænke %s til %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Nåede DeLink-begrænsningen på %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen tvangs-post\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2058,7 +2052,7 @@ msgstr "Kunne ikke læse under beregning af MD5"
msgid "Problem unlinking %s"
msgstr "Problem under aflænkning af %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Kunne ikke omdøbe %s til %s"
@@ -2203,54 +2197,54 @@ msgstr "Kunne ikke skrive filen %s"
msgid "Failed to close file %s"
msgstr "Kunne ikke lukke filen %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Stien %s er for lang"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Pakkede %s ud flere gange"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Mappen %s er omrokeret"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Omrokeringsstien er for lang"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Mappen %s bliver erstattet af en ikke-mappe"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Kunne ikke finde knuden i sin hash-bucket"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Stien er for lang"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Overskriv pakkematch uden version for %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "File %s/%s overskriver filen i pakken %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Kunne ikke finde %s"
@@ -2334,30 +2328,30 @@ msgstr ""
"bruger."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
@@ -2427,16 +2421,6 @@ msgstr "%c%s... Fejl!"
msgid "%c%s... Done"
msgstr "%c%s... Færdig"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Færdig"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2548,69 +2532,63 @@ msgstr "Underprocessen %s modtog en segmenteringsfejl."
msgid "Sub-process %s received signal %u."
msgstr "Underprocessen %s modtog en signal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s returnerede en fejlkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s afsluttedes uventet"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Kunne ikke åbne filen %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Kunne ikke åbne filbeskrivelse %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Kunne ikke oprette underproces IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Kunne ikke udføre komprimeringsprogram "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "læs, mangler stadig at læse %llu men der er ikke flere"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "skriv, mangler stadig at skrive %llu men kunne ikke"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem under lukning af filen %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem under omdøbning af filen %s til %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Fejl ved frigivelse af filen %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problem under synkronisering af fil"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøglering installeret i %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Tomt pakke-mellemlager"
@@ -2636,59 +2614,59 @@ msgstr "Denne APT understøtter ikke versionssystemet '%s'"
msgid "The package cache was built for a different architecture"
msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Afhængigheder"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Præ-afhængigheder"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Foreslåede"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Anbefalede"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Konflikter"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Erstatter"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Overflødiggør"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Ødelægger"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Forbedringer"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "vigtig"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "krævet"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "frivillig"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "ekstra"
@@ -2788,12 +2766,12 @@ msgstr "Åbner %s"
msgid "Line %u too long in source list %s."
msgstr "Linjen %u er for lang i kildelisten %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ugyldig linje %u i kildelisten %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s"
@@ -2836,7 +2814,7 @@ msgid ""
msgstr ""
"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2844,12 +2822,12 @@ msgstr ""
"Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
"tilbageholdte pakker."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2899,12 +2877,12 @@ msgstr "Metoden %s startede ikke korrekt"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet '%s' understøttes ikke"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunne ikke bestemme en passende pakkesystemtype"
@@ -2959,14 +2937,14 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
@@ -2989,26 +2967,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunne ikke finde kildepakkelisten %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Indlæser pakkelisterne"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Samler filudbud"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "IO-fejl ved gemning af kilde-mellemlageret"
@@ -3021,12 +2999,12 @@ msgstr "omdøbning mislykkedes, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hashsum stemmer ikke"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3035,17 +3013,17 @@ msgstr ""
"Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
"punkt eller forkert udformet fil)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3054,27 +3032,27 @@ msgstr ""
"Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
"arkiv vil ikke blive anvendt."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Der opstod en fejl under underskriftsbekræftelse. Arkivet er ikke opdateret "
"og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fejl: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3083,7 +3061,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3092,37 +3070,37 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, 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:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Størrelsen stemmer ikke"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kunne ikke fortolke udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Ingen afsnit i udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Intet hashpunkt i udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldigt punkt 'Valid-Until' i udgivelsesfil %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ugyldigt punkt 'Date' i udgivelsesfil %s"
@@ -3222,22 +3200,22 @@ msgstr "Skriver ny kildeliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Denne disk har følgende kildeliste-indgange:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i manglende filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i ikke-trufne filer\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
@@ -3252,6 +3230,17 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s"
msgid "Hash mismatch for: %s"
msgstr "Hashsum stemmer ikke: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Fil %s starter ikke med en »clearsigned« besked"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nøglering installeret i %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3319,114 +3308,114 @@ msgstr "Forbered for modtagelse af løsning"
msgid "External solver failed without a proper error message"
msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Kør ekstern problemløser"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installerer %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Sætter %s op"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Fjerner %s helt"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Bemærker forsvinding af %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Kører førinstallationsudløser %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Mappe '%s' mangler"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Kunne ikke åbne filen '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Klargør %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Pakker %s ud"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Gør klar til at sætte %s op"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Installerede %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Gør klar til afinstallation af %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Fjernede %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Gør klar til at fjerne %s helt"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Fjernede %s helt"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Kan ikke skrive log, openpty() mislykkedes (/dev/pts ej monteret?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Kører dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Handling blev afbrudt før den kunne afsluttes"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "afhængighedsproblemer - efterlader ukonfigureret"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3434,7 +3423,7 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
"opfølgningsfejl fra en tidligere fejl."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3449,7 +3438,13 @@ msgstr ""
"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
"hukommelsesfejl"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl"
@@ -3479,8 +3474,20 @@ msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet."
msgid "Not locked"
msgstr "Ikke låst"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Fil %s starter ikke med en »clearsigned« besked"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Færdig"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Der opstod en fejl under underskriftsbekræftelse. Arkivet er ikke "
+#~ "opdateret og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Springer ikkeeksisterende fil over %s"
diff --git a/po/de.po b/po/de.po
index 00f40344e..14c07b495 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-06-27 10:55+0200\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr " Versionstabelle:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -648,7 +648,7 @@ msgstr "Abbruch."
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Fehlschlag beim Holen von %s %s\n"
@@ -847,7 +847,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Paketaktualisierung (Upgrade) wird berechnet... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Fehlgeschlagen"
@@ -1054,11 +1054,11 @@ msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
msgid "Changelog for %s (%s)"
msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1153,7 +1153,7 @@ msgstr ""
"bezüglich weitergehender Informationen und Optionen.\n"
" Dieses APT hat Super-Kuh-Kräfte.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1230,8 +1230,7 @@ msgid "%s was already not hold.\n"
msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
@@ -1392,8 +1391,8 @@ msgstr "Zeitüberschreitung der Verbindung"
msgid "Server closed the connection"
msgstr "Verbindung durch Server geschlossen"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Lesefehler"
@@ -1406,8 +1405,8 @@ msgid "Protocol corruption"
msgstr "Protokoll beschädigt"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Schreibfehler"
@@ -1463,7 +1462,7 @@ msgstr "Zeitüberschreitung bei Datenverbindungsaufbau"
msgid "Unable to accept connection"
msgstr "Verbindung konnte nicht angenommen werden."
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problem bei Bestimmung des Hashwertes einer Datei"
@@ -1490,96 +1489,91 @@ msgstr "Abfrage"
msgid "Unable to invoke "
msgstr "Aufruf nicht möglich: "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Verbindung mit %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Socket für %s konnte nicht erzeugt werden (f=%u t=%u p=%u)."
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Verbindung mit %s:%s kann nicht aufgebaut werden (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Verbindung mit %s:%s konnte nicht aufgebaut werden (%s), eine "
"Zeitüberschreitung trat auf."
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Verbindung mit %s:%s nicht möglich (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Verbindung mit %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "»%s« konnte nicht aufgelöst werden."
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Verbindung mit %s:%s nicht möglich:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte "
"jedoch nicht ermittelt werden?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"»gpgv« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist gpgv "
"installiert?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Unbekannter Fehler beim Ausführen von gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Die folgenden Signaturen waren ungültig:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1623,55 +1617,55 @@ msgstr ""
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Zeitüberschreitung bei Verbindung"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben der Ausgabedatei"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Fehler beim Schreiben in Datei"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der "
"anderen Seite geschlossen."
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Interner Fehler"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "%s kann nicht gelesen werden."
@@ -1797,7 +1791,7 @@ msgstr ""
" -c=? Diese Konfigurationsdatei lesen\n"
" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Schreiben nach %s nicht möglich"
@@ -1951,8 +1945,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "%s mit »stat« abfragen fehlgeschlagen"
@@ -1965,87 +1959,87 @@ msgstr "Archiv hat keinen Steuerungsdatensatz."
msgid "Unable to get a cursor"
msgstr "Unmöglich, einen Cursor zu bekommen"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s mit »stat« abfragen nicht möglich.\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "F: Fehler gehören zu Datei "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "%s konnte nicht aufgelöst werden."
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Öffnen von %s fehlgeschlagen"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink von %s fehlgeschlagen"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Entfernen (unlink) von %s fehlgeschlagen"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-Limit von %sB erreicht\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Archiv hatte kein Feld »package«"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Betreuer ist %s und nicht %s.\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n"
@@ -2119,7 +2113,7 @@ msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen"
msgid "Problem unlinking %s"
msgstr "Problem beim Entfernen (unlink) von %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s konnte nicht in %s umbenannt werden."
@@ -2265,54 +2259,54 @@ msgstr "Datei %s konnte nicht geschrieben werden."
msgid "Failed to close file %s"
msgstr "Datei %s konnte nicht geschlossen werden."
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Der Pfad %s ist zu lang."
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s mehr als einmal entpackt"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Das Verzeichnis %s ist umgeleitet."
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Der Umleitungspfad ist zu lang."
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt."
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Knoten konnte nicht in seinem Hash gefunden werden."
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Der Pfad ist zu lang."
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Pakettreffer ohne Version für %s wird überschrieben."
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben."
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "%s mit »stat« abfragen nicht möglich"
@@ -2395,30 +2389,30 @@ msgstr ""
"MMap vom Benutzer deaktiviert ist."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li d %li h %li min %li s"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%li h %li min %li s"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%li min %li s"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%li s"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
@@ -2490,16 +2484,6 @@ msgstr "%c%s... Fehler!"
msgid "%c%s... Done"
msgstr "%c%s... Fertig"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Fertig"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2617,73 +2601,67 @@ msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen."
msgid "Sub-process %s received signal %u."
msgstr "Unterprozess %s hat das Signal %u empfangen."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Unterprozess %s unerwartet beendet"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Datei %s konnte nicht geöffnet werden."
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden."
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr ""
"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Fehler beim Ausführen von Komprimierer "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr ""
"Lesevorgang: es verbleiben noch %llu zu lesen, jedoch ist nichts mehr übrig."
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr ""
"Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch "
"nicht möglich."
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem beim Schließen der Datei %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem beim Umbenennen der Datei %s nach %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem beim Entfernen (unlink) der Datei %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problem beim Synchronisieren der Datei"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Kein Schlüsselring in %s installiert"
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Leerer Paketzwischenspeicher"
@@ -2710,59 +2688,59 @@ msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt."
msgid "The package cache was built for a different architecture"
msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut."
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Hängt ab von"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Hängt ab von (vorher)"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Schlägt vor"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Empfiehlt"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Kollidiert mit"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Ersetzt"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Löst ab"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Beschädigt"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Wertet auf"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "wichtig"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "erforderlich"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "optional"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2863,12 +2841,12 @@ msgstr "%s wird geöffnet."
msgid "Line %u too long in source list %s."
msgstr "Zeile %u in Quellliste %s zu lang."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
@@ -2912,7 +2890,7 @@ msgstr ""
"Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür "
"gefunden werden."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2920,13 +2898,13 @@ msgstr ""
"Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; "
"dies könnte durch zurückgehaltene Pakete verursacht worden sein."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte "
"Pakete."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2978,12 +2956,12 @@ msgstr ""
"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und "
"drücken Sie die Eingabetaste (Enter)."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketierungssystem »%s« wird nicht unterstützt."
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
@@ -3043,14 +3021,14 @@ msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
@@ -3079,27 +3057,27 @@ msgstr ""
"Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen "
"diese APT-Version umgehen kann."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden."
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Paketlisten werden gelesen"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
@@ -3112,12 +3090,12 @@ msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hash-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3126,17 +3104,17 @@ msgstr ""
"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
"(falscher Eintrag in sources.list oder missgebildete Datei)."
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden."
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3145,15 +3123,15 @@ msgstr ""
"Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für "
"dieses Depot werden nicht angewendet."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository "
@@ -3161,12 +3139,12 @@ msgstr ""
"GPG-Fehler: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-Fehler: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3176,7 +3154,7 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3185,38 +3163,38 @@ msgstr ""
"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
"Sie dieses Paket von Hand korrigieren müssen."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Größe stimmt nicht überein"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release-Datei %s kann nicht verarbeitet werden."
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Keine Bereiche (Sections) in Release-Datei %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Kein Hash-Eintrag in Release-Datei %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
@@ -3316,22 +3294,22 @@ msgstr "Schreiben der neuen Quellliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Quelllisteneinträge für dieses Medium sind:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Es wurden %i Datensätze geschrieben.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3348,6 +3326,17 @@ msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-Summe stimmt nicht überein für: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Kein Schlüsselring in %s installiert"
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3422,117 +3411,117 @@ msgid "External solver failed without a proper error message"
msgstr ""
"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Externen Problemlöser ausführen"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s wird installiert."
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s wird konfiguriert."
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s wird entfernt."
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s wird vollständig entfernt."
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Verschwinden von %s festgestellt"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Aufruf des Nach-Installations-Triggers %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Verzeichnis »%s« fehlt"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Datei »%s« konnte nicht geöffnet werden."
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s wird vorbereitet."
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s wird entpackt."
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Konfiguration von %s wird vorbereitet."
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s installiert"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Entfernen von %s wird vorbereitet."
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s entfernt"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Vollständiges Entfernen von %s wird vorbereitet."
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s vollständig entfernt"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Schreiben des Protokolls nicht möglich, openpty() fehlgeschlagen (/dev/pts "
"nicht eingebunden?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Ausführen von dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
"erreicht ist."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3540,7 +3529,7 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf "
"hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3556,7 +3545,15 @@ msgstr ""
"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
"wegen erschöpftem Arbeitsspeicher hindeutet."
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
+"erreicht ist"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3592,8 +3589,21 @@ msgstr ""
msgid "Not locked"
msgstr "Nicht gesperrt"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Fertig"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository "
+#~ "wurde nicht aktualisiert und die vorherigen Indexdateien werden "
+#~ "verwendet. GPG-Fehler: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Nicht vorhandene Datei %s wird übersprungen."
diff --git a/po/dz.po b/po/dz.po
index 01854d2d6..9e32fff07 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po.pot\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -645,7 +645,7 @@ msgstr "བར་བཤོལ་འབད།"
msgid "Do you want to continue [Y/n]? "
msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
@@ -828,7 +828,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -1012,11 +1012,11 @@ msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འད
msgid "Changelog for %s (%s)"
msgstr "%s (%s)་ལུ་མཐུད་དོ།"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1105,7 +1105,7 @@ msgstr ""
"ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
" འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1176,8 +1176,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
@@ -1316,8 +1315,8 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས"
msgid "Server closed the connection"
msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "འཛོལ་བ་ལྷབ།"
@@ -1330,8 +1329,8 @@ msgid "Protocol corruption"
msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "འཛོལ་བ་འབྲི།"
@@ -1385,7 +1384,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན
msgid "Unable to accept connection"
msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
@@ -1412,94 +1411,89 @@ msgstr "འདྲི་དཔྱད།"
msgid "Unable to invoke "
msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s (%s)་ལུ་མཐུད་དོ།"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s (f=%u t=%u p=%u)གི་དོན་ལུ་སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s (%s)ལུ་མཐུད་ལམ་དེ་འགོ་འབྱེད་འབད་མ་ཚུགས།"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་ མཐུད་ལམ་ངལ་མཚམས།"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "%s་ལུ་མཐུད་དོ།"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s'མོས་མཐུན་འབད་མ་ཚུགས།"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
"མ་ཚུགས?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1538,53 +1532,53 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ
msgid "Unknown date format"
msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "ནང་འཁོད་འཛོལ་བ།"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
@@ -1707,7 +1701,7 @@ msgstr ""
" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་"
"བཟུམ།\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr " %sལུ་འབྲི་མ་ཚུགས།"
@@ -1857,8 +1851,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
@@ -1871,87 +1865,87 @@ msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་
msgid "Unable to get a cursor"
msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "ཌབ་ལུ:%sསྣོད་ཐོ་འདི་ལྷག་མ་ཚུགས།\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུགས།\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "ཨི:"
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "ཌབ་ལུ:"
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "%s་མོས་མཐུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "རྩ་འབྲེལ་ཕྱིར་བགྲོད་འབད་ནི་ལུ་འཐུ་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "%s་འབྲེལ་ལམ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "%s་འབྲེལ་ལམ་མེད་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
@@ -2025,7 +2019,7 @@ msgstr "ཨེམ་ཌི་༥་གློག་རིག་རྐྱབ་པ
msgid "Problem unlinking %s"
msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལ།"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -2172,54 +2166,54 @@ msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལ
msgid "Failed to close file %s"
msgstr "%s་ཡིག་སྣོད་འདི་ཁ་བསྡམས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "%s་འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "སྦུང་ཚན་བཟོ་བཤོལ་%s་གཅིག་ལས་ལྷག་སྟེ་འདུག"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "སྣོད་ཐོ་%s་འདི་ཁ་ཕྱོགས་སྒྱུར་དེ་ཡོད།"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "ཐུམ་སྒྲིལ་འདི་གིས་ག་སྒྱུར་དམིགས་གཏད་%s/%s་ལུ་འབྲི་ནིའི་འབད་རྩོལ་བསྐྱེདཔ་དེ་ཡོད།"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "ཁ་སྒྱུར་འགྲུལ་ལམ་འདི་གནམ་མེད་ས་མེད་རིངམ་ཨིན་པས།"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "སྣོད་ཡིག་%s་འདི་སྣོད་ཡིག་མེན་མི་ཅིག་གིས་ཚབ་བཙུག་དེ་ཡོདཔ་ཨིན།"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "ཁོང་རའི་དྲྭ་རྟགས། (#)རྡོབ་ནང་ལུ་མཐུད་མཚམས་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "འགྲུལ་ལམ་དེ་གནམ་མེད་ས་མེད་རིངམ་ཅིག་ཨིན་པས།"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "%s་གི་དོན་ལུ་ཚབ་སྲུང་འབད་བའི་ཐུམ་སྒྲིལ་དེ་གིས་འཐོན་རིམ་གཅིག་ད་ཡང་མཐུན་སྒྲིག་མི་འབད་བས།"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་སྣོད་%s/%sགིས་གཅིག་ཚབ་སྲུང་འབདཝ་ཨིན།"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
@@ -2298,30 +2292,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
@@ -2391,16 +2385,6 @@ msgstr "%c%s... འཛོལ་བ་!"
msgid "%c%s... Done"
msgstr "%c%s... འབད་ཚར་ཡོད།"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... འབད་ཚར་ཡོད།"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2513,69 +2497,63 @@ msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བག
msgid "Sub-process %s received signal %u."
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་སི་ གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
@@ -2602,59 +2580,59 @@ msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'
msgid "The package cache was built for a different architecture"
msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "རྟེནམ་ཨིན།"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "མི་མཐུནམ་ཨིན།"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "ཚབ་བཙུགསཔ་ཨིན།"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "གལ་ཅན།"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "དགོས་མཁོ་ཡོདཔ།"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "ཚད་ལྡན།"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "གདམ་ཁ་ཅན།"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "ཐེབས།"
@@ -2755,12 +2733,12 @@ msgstr "%s་ཁ་ཕྱེ་དོ།"
msgid "Line %u too long in source list %s."
msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
@@ -2802,7 +2780,7 @@ msgstr ""
"ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
"མ་ཐོབ།"
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2810,11 +2788,11 @@ msgstr ""
"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་"
"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།"
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2865,12 +2843,12 @@ msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦ
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།"
@@ -2924,14 +2902,14 @@ msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མ
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
@@ -2953,26 +2931,26 @@ msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊ
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
@@ -2985,54 +2963,54 @@ msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འ
msgid "MD5Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3041,7 +3019,7 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3050,38 +3028,38 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "ཚད་མ་མཐུན།"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
@@ -3178,22 +3156,22 @@ msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གས
msgid "Source list entries for this disc are:\n"
msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i་དྲན་མཐོ་དེ་ཚུ་བྲིས་ཡོད།\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་ཡོད།\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i་མཐུན་སྒྲིག་མེདཔ་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i་དྲན་ཐོ་ཚུ་བྲིས་བཞག་ཡོདཔ་ཨིན།\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3210,6 +3188,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3273,119 +3262,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3397,7 +3386,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3427,6 +3422,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... འབད་ཚར་ཡོད།"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
diff --git a/po/el.po b/po/el.po
index 75625de47..0a7becfc7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -165,7 +165,7 @@ msgid " Version table:"
msgstr " Πίνακας Έκδοσης:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -654,7 +654,7 @@ msgstr "Εγκατάλειψη."
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -843,7 +843,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Απέτυχε"
@@ -1037,11 +1037,11 @@ msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισ
msgid "Changelog for %s (%s)"
msgstr "Changelog για %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1126,7 +1126,7 @@ msgstr ""
"για περισσότερες πληροφορίες και επιλογές.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1197,8 +1197,7 @@ msgid "%s was already not hold.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
@@ -1336,8 +1335,8 @@ msgstr "Λήξη χρόνου σύνδεσης"
msgid "Server closed the connection"
msgstr "Ο διακομιστής έκλεισε την σύνδεση"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Σφάλμα ανάγνωσης"
@@ -1350,8 +1349,8 @@ msgid "Protocol corruption"
msgstr "Αλλοίωση του πρωτοκόλλου"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Σφάλμα εγγραφής"
@@ -1405,7 +1404,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
@@ -1432,95 +1431,90 @@ msgstr "Επερώτηση"
msgid "Unable to invoke "
msgstr "Αδύνατη η εκτέλεση"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Σύνδεση στο %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Σύνδεση στο %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Αδύνατη η εύρεση του '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Αδύνατη η σύνδεση στο %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
"αποτυπώματος?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
"εγκατεστημένο το gpgv;)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1560,54 +1554,54 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Αδύνατη η ανάγνωση του %s"
@@ -1730,7 +1724,7 @@ msgstr ""
" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Αδύνατη η εγγραφή στο %s"
@@ -1880,8 +1874,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
@@ -1894,87 +1888,87 @@ msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχο
msgid "Unable to get a cursor"
msgstr "Αδύνατη η πρόσβαση σε δείκτη"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Σφάλματα στο αρχείο"
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Αδύνατη η εύρεση του %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Αποτυχία ανεύρεσης"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Αποτυχία ανοίγματος του %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "Αποσύνδεση %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Αποτυχία ανάγνωσης του %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Αποτυχία αποσύνδεσης του %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr " Αποτυχία σύνδεσης του %s με το %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Αποσύνδεση ορίου του %sB hit.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s συντηρητής είναι ο %s όχι ο %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
@@ -2048,7 +2042,7 @@ msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό
msgid "Problem unlinking %s"
msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Αποτυχία μετονομασίας του %s σε %s"
@@ -2194,54 +2188,54 @@ msgstr "Αποτυχία εγγραφής του αρχείου %s"
msgid "Failed to close file %s"
msgstr "Αποτυχία στο κλείσιμο του αρχείου %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Η διαδρομή %s έχει υπερβολικό μήκος"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Αποσυμπίεση του %s πάνω από μια φορά"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Ο φάκελος %s έχει εκτραπεί"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Η διαδρομή έχει υπερβολικό μήκος"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
@@ -2321,30 +2315,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Η επιλογή %s δε βρέθηκε"
@@ -2416,16 +2410,6 @@ msgstr "%c%s... Σφάλμα!"
msgid "%c%s... Done"
msgstr "%c%s... Ολοκληρώθηκε"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Ολοκληρώθηκε"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2541,69 +2525,63 @@ msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμ
msgid "Sub-process %s received signal %u."
msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Αποτυχία εκτέλεσης του συμπιεστή "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Εγκατάλειψη της εγκατάστασης."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Άδειο cache πακέτων"
@@ -2630,59 +2608,59 @@ msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απ
msgid "The package cache was built for a different architecture"
msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Εξαρτάται από"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "ΠροΕξαρτάται από"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Προτείνει"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Συστήνει"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Ασύμβατο με"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Αντικαθιστά"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Απαρχαιώνει"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Χαλάει"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "σημαντικό"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "απαιτούμενο"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "καθιερωμένο"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "προαιρετικό"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "επιπλέον"
@@ -2782,12 +2760,12 @@ msgstr "Άνοιγμα του %s"
msgid "Line %u too long in source list %s."
msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
@@ -2829,7 +2807,7 @@ msgstr ""
"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
"κάποιας κατάλληλης αρχείοθήκης."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2837,11 +2815,11 @@ msgstr ""
"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
"προκλήθηκε από κρατούμενα πακέτα."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2894,12 +2872,12 @@ msgstr ""
"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
"enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
@@ -2955,14 +2933,14 @@ msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκ
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
@@ -2987,26 +2965,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Ανάγνωση Λιστών Πακέτων"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Συλλογή Παροχών Αρχείου"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
@@ -3019,53 +2997,53 @@ msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3074,7 +3052,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3083,7 +3061,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3091,31 +3069,31 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
@@ -3213,22 +3191,22 @@ msgstr "Eγγραφή νέας λίστας πηγών\n"
msgid "Source list entries for this disc are:\n"
msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Εγιναν %i εγγραφές.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
@@ -3243,6 +3221,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Ανόμοιο MD5Sum"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Εγκατάλειψη της εγκατάστασης."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3306,121 +3295,121 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Εγκατάσταση του %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Ρύθμιση του %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Αφαιρώ το %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Το %s διαγράφηκε πλήρως"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Εκτέλεση του post-installation trigger %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Ο φάκελος %s αγνοείται."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Προετοιμασία του %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Ξεπακετάρισμα του %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Προετοιμασία ρύθμισης του %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Έγινε εγκατάσταση του %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Προετοιμασία για την αφαίρεση του %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Αφαίρεσα το %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Το %s διαγράφηκε πλήρως"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι "
"προσαρτημένο το /dev/pts;)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3432,7 +3421,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3462,6 +3457,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Ολοκληρώθηκε"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
diff --git a/po/es.po b/po/es.po
index 286e5455b..2079bc67f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2011-01-24 11:47+0100\n"
"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -163,7 +163,7 @@ msgstr "Debe proporcionar al menos un patrón de búsqueda"
#: cmdline/apt-cache.cc:1361
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "Esta orden está obsoleta. Use «apt-mark showauto» en su lugar."
#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
#, c-format
@@ -210,7 +210,7 @@ msgid " Version table:"
msgstr " Tabla de versión:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -352,7 +352,7 @@ msgstr "S"
#: cmdline/apt-get.cc:140
msgid "N"
-msgstr ""
+msgstr "N"
#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
#, c-format
@@ -697,7 +697,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -887,12 +887,13 @@ msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
+"Esta orden es obsoleta. Use «apt-mark auto» y «apt-mark manual» en su lugar."
#: cmdline/apt-get.cc:2185
msgid "Calculating upgrade... "
msgstr "Calculando la actualización... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Falló"
@@ -912,12 +913,12 @@ msgstr "No se puede bloquear el directorio de descarga"
#: cmdline/apt-get.cc:2388
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgstr "No se puede encontrar el origen para descargar la versión «%s» de «%s»"
#: cmdline/apt-get.cc:2393
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "Descargando %s %s"
#: cmdline/apt-get.cc:2453
msgid "Must specify at least one package to fetch source for"
@@ -1019,6 +1020,8 @@ msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"No hay información de la arquitectura disponible para %s. Vea apt.conf(5) "
+"APT::Architectures para configurar"
#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
#, c-format
@@ -1092,11 +1095,11 @@ msgstr "No se pudieron procesar las dependencias de construcción"
msgid "Changelog for %s (%s)"
msgstr "Conectando a %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1187,7 +1190,7 @@ msgstr ""
"para más información y opciones.\n"
" Este APT tiene poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1262,8 +1265,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ya está en su versión más reciente.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero no estaba allí"
@@ -1280,7 +1282,7 @@ msgstr "No se pudo abrir %s"
#: cmdline/apt-mark.cc:332
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Fallo al ejecutar dpkg. ¿Usted es root?"
#: cmdline/apt-mark.cc:379
msgid ""
@@ -1303,6 +1305,26 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
+"Uso: apt-mark [opciones] {auto|manual} paq1 [paq2 ...]\n"
+"\n"
+"apt-mark es una interfaz de linea de órdenes para marcar paquetes\n"
+"para instalación manual o automática. También puede marcar listas.\n"
+"\n"
+"Órdenes:\n"
+" auto - Marca los paquetes para instalación automática\n"
+" manual - Marca los paquetes para instalación manual\n"
+"\n"
+"Opciones:\n"
+" -h Este texto de ayuda.\n"
+" -q Salida del registro - sin indicador de progreso\n"
+" -qq Sin salida excepto para errores\n"
+" -s No-act. Solo imprime lo que se haría.\n"
+" -f Marca lectura/escritura auto/manual en el archivo dado\n"
+" -c=? Lee este archivo de configuración\n"
+" -o=? Establece un opción de configuración arbitraria, por ejemplo -o dir::"
+"cache=/tmp\n"
+"Vea las páginas del manual de apt-mark(8) y apt.conf(5) para tener más "
+"información."
#: methods/cdrom.cc:203
#, c-format
@@ -1401,8 +1423,8 @@ msgstr "La conexión expiró"
msgid "Server closed the connection"
msgstr "El servidor cerró la conexión"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Error de lectura"
@@ -1415,8 +1437,8 @@ msgid "Protocol corruption"
msgstr "Fallo del protocolo"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Error de escritura"
@@ -1470,7 +1492,7 @@ msgstr "Expiró conexión a socket de datos"
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexión"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Se produjo un problema al hacer un hash del archivo"
@@ -1497,93 +1519,88 @@ msgstr "Consulta"
msgid "Unable to invoke "
msgstr "No pude invocar "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectando a %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "No pude crear un socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "No puedo iniciar la conexión a %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "No pude conectarme a %s:%s (%s), expiró tiempo para conexión"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "No pude conectarme a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "No se pudo resolver «%s»"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Fallo temporal al resolver «%s»"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "No se pudo conectar a %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error interno: Firma correcta, ¡¿pero no se pudo determinar su huella "
"digital?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Se encontró al menos una firma inválida."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"No se pudo ejecutar «gpgv» para verificar la firma (¿está instalado gpgv?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Error desconocido ejecutando gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Las siguientes firms fueron inválidas:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1593,7 +1610,7 @@ msgstr ""
#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "Los archivos vacíos no pueden ser archivadores válidos"
#: methods/http.cc:394
msgid "Waiting for headers"
@@ -1623,53 +1640,53 @@ msgstr "Éste servidor de http tiene el soporte de alcance roto"
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Falló la selección"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Expiró la conexión"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Fallo la conexión"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Error interno"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "No pude leer %s"
@@ -1797,7 +1814,7 @@ msgstr ""
" -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
"cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "No se puede escribir en %s"
@@ -1947,8 +1964,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "No se pudo abrir el archivo DB %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "No pude leer %s"
@@ -1961,87 +1978,87 @@ msgstr "No hay registro de control del archivo"
msgid "Unable to get a cursor"
msgstr "No se pudo obtener un cursor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: No se pudo leer directorio %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: No se pudo leer %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Errores aplicables al archivo "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "No se pudo resolver %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Falló el recorrido por el árbol."
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "No se pudo abrir %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "No se pudo leer el enlace %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "No se pudo desligar %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** No pude enlazar %s con %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink se ha llegado al límite de %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Archivo no tiene campo de paquetes"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no tiene entrada de predominio\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el encargado de %s es %s y no %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no tiene una entrada fuente predominante\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco tiene una entrada binaria predominante\n"
@@ -2115,7 +2132,7 @@ msgstr "No se pudo leer mientras se computaba MD5"
msgid "Problem unlinking %s"
msgstr "Se produjo un problema al desligar %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Falló el renombre de %s a %s"
@@ -2263,54 +2280,54 @@ msgstr "Falló la escritura del archivo %s"
msgid "Failed to close file %s"
msgstr "No pude cerrar el archivo %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "La trayectoria %s es demasiado larga"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Desempaquetando %s más de una vez"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "El directorio %s está desviado"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "El paquete está tratando de escribir al blanco desviado %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "La trayectoria de desviación es demasiado larga"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "El directorio %s está siendo reemplazado por un no-directorio"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "No pude localizar el nodo en su bote de enlace"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "La trayectoria es muy larga"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Sobreescribiendo concordancia del paquete sin versión para %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "No pude leer %s"
@@ -2392,30 +2409,30 @@ msgstr ""
"deshabilitado el crecimiento automático."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin. %liseg."
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin. %liseg."
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin. %liseg."
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%liseg."
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Selección %s no encontrada"
@@ -2489,16 +2506,6 @@ msgstr "%c%s... ¡Error!"
msgid "%c%s... Done"
msgstr "%c%s... Hecho"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Hecho"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2584,23 +2591,27 @@ msgstr "No se pudo bloquear %s"
#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "La lista de archivos no se puede crear como «%s» no es un directorio"
#: apt-pkg/contrib/fileutl.cc:426
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "Ignorando «%s» en directorio «%s» dado que no es un archivo regular"
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
+"Ignorando el archivo «%s» en el directorio «%s» dado que no tiene extensión "
+"del nombre"
#: apt-pkg/contrib/fileutl.cc:453
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
+"Ignorando archivo «%s» en directorio «%s» dado que tiene una extensión de "
+"nombre de archivo inválida"
#: apt-pkg/contrib/fileutl.cc:840
#, c-format
@@ -2612,69 +2623,63 @@ msgstr "El subproceso %s recibió un fallo de segmentación."
msgid "Sub-process %s received signal %u."
msgstr "El subproceso %s recibió la señal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "El subproceso %s devolvió un código de error (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subproceso %s terminó de forma inesperada"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "No pude abrir el fichero %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "No se pudo abrir el descriptor de fichero %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "No se pudo crear el subproceso IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "No se pudo ejecutar el compresor "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "leídos, todavía debía leer %lu pero no queda nada"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Se produjo un problema al cerrar el fichero %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Se produjo un problema al renombrar el fichero %s a %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Se produjo un problema al desligar el fichero %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Se produjo un problema al sincronizar el fichero"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "No se instaló ningún anillo de claves %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Caché de paquetes vacía."
@@ -2701,59 +2706,59 @@ msgstr "Esta versión de APT no soporta el sistema de versiones «%s»"
msgid "The package cache was built for a different architecture"
msgstr "La caché de paquetes se había creado para una arquitectura diferente"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Depende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "PreDepende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Sugiere"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Recomienda"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Entra en conflicto"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Reemplaza"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Hace obsoleto"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Rompe"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Mejora"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "requiere"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "estándar"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2859,12 +2864,12 @@ msgstr "Abriendo %s"
msgid "Line %u too long in source list %s."
msgstr "Línea %u demasiado larga en la lista de fuentes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
@@ -2909,7 +2914,7 @@ msgstr ""
"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
"éste."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2917,12 +2922,12 @@ msgstr ""
"Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido "
"causado por paquetes retenidos."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2973,12 +2978,12 @@ msgstr "El método %s no se inició correctamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y pulse Intro."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "No está soportado el sistema de paquetes «%s»"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
@@ -3011,6 +3016,8 @@ msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"El valor «%s» es inválido para APT::Default-Release dado que esa versión no "
+"está disponible en las fuentes"
#: apt-pkg/policy.cc:399
#, c-format
@@ -3034,14 +3041,14 @@ msgstr "La caché tiene una versión incompatible de sistema de versiones"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
@@ -3066,27 +3073,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Vaya, excedió el número de dependencias que este APT es capaz de manejar."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Al procesar las dependencias de archivos no se encontró el paquete %s %s"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "No se puede leer la lista de paquetes fuente %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Leyendo lista de paquetes"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Recogiendo archivos que proveen"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Error de E/S guardando caché fuente"
@@ -3099,45 +3106,49 @@ msgstr "falló el cambio de nombre, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "La suma hash difiere"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"No se pudo encontrar la entrada esperada «%s» en el archivo Release (entrada "
+"incorrecta en sources.list o archivo mal formado)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave pública disponible para los siguientes "
"identificadores de clave:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"El archivo de la versión de %s ha caducado (no válido desde %s). Las "
+"actualizaciones de este repositorio no se aplicarán."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Se produjo un error durante la verificación de las firmas. El repositorio no "
@@ -3145,12 +3156,12 @@ msgstr ""
"GPG es: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Error de GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3160,7 +3171,7 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3169,7 +3180,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:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3177,31 +3188,31 @@ msgstr ""
"Los archivos de índice de paquetes están dañados. No existe un campo "
"«Filename:» para el paquete %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "El tamaño difiere"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "No se encontraron secciones en el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "No existe una entrada «Hash» en el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada «Date» inválida en el archivo «Release» %s"
@@ -3301,22 +3312,22 @@ msgstr "Escribiendo nueva lista de fuente\n"
msgid "Source list entries for this disc are:\n"
msgstr "Las entradas de la lista de fuentes para este disco son:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i registros escritos.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i registros escritos con %i fichero de menos.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i registros escritos con %i fichero mal emparejado\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3332,6 +3343,17 @@ msgstr "No se pudo encontrar un registro de autenticación para: %s"
msgid "Hash mismatch for: %s"
msgstr "La suma hash difiere para: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "El archivo %s no comienza con un mensaje limpio de firma"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No se instaló ningún anillo de claves %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3391,131 +3413,131 @@ msgstr ""
#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
msgid "Send scenario to solver"
-msgstr ""
+msgstr "Enviar escenario al resolutor"
#: apt-pkg/edsp.cc:209
msgid "Send request to solver"
-msgstr ""
+msgstr "Enviar petición al resolutor"
#: apt-pkg/edsp.cc:279
msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Preparar para recibir solución"
#: apt-pkg/edsp.cc:286
msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "El resolutor externo falló sin un mensaje de error adecuado"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
-msgstr ""
+msgstr "Ejecutar resolutor externo"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Borrando completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Se detectó la desaparición de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Ejecutando disparador post-instalación %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta el directorio «%s»."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "No pude abrir el fichero «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparándose para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparándose para eliminar %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s eliminado"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparándose para eliminar completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Se borró completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"No pudo escribirse el registro, falló la llamada a openpty() (¿está montado "
"«/dev/pts?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Ejecutando dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "La operación se interrumpió antes de que pudiera terminar"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de "
"«MaxReports»"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - dejando sin instalar"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3523,7 +3545,7 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica que es "
"un mensaje de error asociado a un fallo previo."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3539,7 +3561,15 @@ msgstr ""
"No se escribió un informe «apport» porque el mensaje de error indica un "
"error de memoria excedida"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"No hay informe de apport escrito, porque el mensaje de error indica un "
+"problema en el sistema local"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3574,6 +3604,22 @@ msgstr ""
msgid "Not locked"
msgstr "No bloqueado"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Hecho"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Se produjo un error durante la verificación de las firmas. El repositorio "
+#~ "no está actualizado y se utilizarán los ficheros de índice antiguos. El "
+#~ "error GPG es: %s: %s\n"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Omitiendo el fichero inexistente %s"
diff --git a/po/eu.po b/po/eu.po
index f327b113c..86dcc1f34 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Bertsio taula:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -448,7 +448,7 @@ msgstr "%s paketeak ez du instalatzeko hautagairik"
#: cmdline/apt-get.cc:725
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "'%s bezalako pakete birtualak ezin dira ezabatu\n"
#. TRANSLATORS: Note, this is not an interactive question
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -635,7 +635,7 @@ msgstr "Abortatu."
msgid "Do you want to continue [Y/n]? "
msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
@@ -686,6 +686,7 @@ msgstr ""
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
+"Lortu ezin den '%s' helburu bertsioa saltatu egin da '%s' paketearentzat."
#: cmdline/apt-get.cc:1593
#, fuzzy, c-format
@@ -696,7 +697,7 @@ msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
#: cmdline/apt-get.cc:1631
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Saltatu ez dagoen '%s' bertsioa '%s' paketearentzat"
#: cmdline/apt-get.cc:1647
msgid "The update command takes no arguments"
@@ -829,7 +830,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Huts egin du"
@@ -870,6 +871,9 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
+"OHARRA: '%s' paketea hemen dagoen '%s' bertsio-kontrol sisteman mantentzen "
+"da:\n"
+"%s\n"
#: cmdline/apt-get.cc:2515
#, c-format
@@ -1018,11 +1022,11 @@ msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
msgid "Changelog for %s (%s)"
msgstr "Konektatzen -> %s.(%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1109,13 +1113,18 @@ msgstr ""
"sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
" APT honek Super Behiaren Ahalmenak ditu.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"OHARRA: Hau proba bat besterik ez da.\n"
+" apt-get-ek super-erabiltzaile baimenak behar ditu benetan "
+"exekutatzeko.\n"
+" Kontuan hartu blokeoa ere desaktibatuta dagoela\n"
+" beraz, ez izan egungo egoera errealaren menpeko!"
#: cmdline/acqprogress.cc:60
msgid "Hit "
@@ -1180,8 +1189,7 @@ msgid "%s was already not hold.\n"
msgstr "%s bertsiorik berriena da jada.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
@@ -1322,8 +1330,8 @@ msgstr "Konexioa denboraz kanpo"
msgid "Server closed the connection"
msgstr "Zerbitzariak konexioa itxi du"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Irakurketa errorea"
@@ -1336,8 +1344,8 @@ msgid "Protocol corruption"
msgstr "Protokolo hondatzea"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Idazketa errorea"
@@ -1392,7 +1400,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du"
msgid "Unable to accept connection"
msgstr "Ezin da konexioa onartu"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1419,92 +1427,87 @@ msgstr "Kontsulta"
msgid "Unable to invoke "
msgstr "Ezin da deitu "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Konektatzen -> %s.(%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Ezin izan da konektatu -> %s:%s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Konektatzen -> %s..."
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ezin izan da '%s' ebatzi"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Aldi baterako akatsa '%s' ebaztean"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ezin da konektatu -> %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Beintza sinadura baliogabe bat aurkitu da."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Errore ezezaguna gpgv exekutatzean"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Ondorengo sinadurak baliogabeak dira:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1544,53 +1547,53 @@ msgstr "http zerbitzariak barruti onarpena apurturik du"
msgid "Unknown date format"
msgstr "Datu formatu ezezaguna"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Konexioaren denbora muga gainditu da"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Barne errorea"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Ezin da %s irakurri"
@@ -1711,7 +1714,7 @@ msgstr ""
" -c=? Irakurri konfigurazio fitxategi hau\n"
" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "%s : ezin da idatzi"
@@ -1856,8 +1859,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Ezin da ireki %s datu-base fitxategia: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Huts egin du %s(e)tik datuak lortzean"
@@ -1870,87 +1873,87 @@ msgstr "Artxiboak ez du kontrol erregistrorik"
msgid "Unable to get a cursor"
msgstr "Ezin da kurtsorerik eskuratu"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Ezin da %s direktorioa irakurri\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Ezin da %s atzitu\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Erroreak fitxategiari dagozkio "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Huts egin du %s ebaztean"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Huts egin dute zuhaitz-urratsek"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Huts egin du %s irekitzean"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Huts egin du %s esteka irakurtzean"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Huts egin du %s desestekatzean"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-en mugara (%sB) heldu da.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Artxiboak ez du pakete eremurik"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s: ez du override sarrerarik\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantentzailea %s da, eta ez %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s: ez du jatorri gainidazketa sarrerarik\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s: ez du bitar gainidazketa sarrerarik\n"
@@ -2024,7 +2027,7 @@ msgstr "Huts egin du MD5 konputatzean"
msgid "Problem unlinking %s"
msgstr "Arazoa %s desestekatzean"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
@@ -2169,54 +2172,54 @@ msgstr "Ezin izan da %s fitxategian idatzi"
msgid "Failed to close file %s"
msgstr "Ezin izan da %s fitxategia itxi"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "%s bidea luzeegia da"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s behin baino gehiagotan deskonprimitzen"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "%s direktorioa desbideratuta dago"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Desbideratzearen bidea luzeegia da"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "%s direktorioa ez-direktorio batekin ordezten ari da"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Bidea luzeegia da"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "%s/%s fitxategiak %s paketekoa gainidazten du"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Ezin da daturik lortu %s(e)tik"
@@ -2297,30 +2300,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "%s hautapena ez da aurkitu"
@@ -2390,16 +2393,6 @@ msgstr "%c%s... Errorea!"
msgid "%c%s... Done"
msgstr "%c%s... Eginda"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Eginda"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2515,69 +2508,63 @@ msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
msgid "Sub-process %s received signal %u."
msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s azpiprozesua ustekabean amaitu da"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "%s fitxategia ezin izan da ireki"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Huts egin du IPC azpiprozesua sortzean"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Huts egin du konpresorea exekutatzean "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Arazoa fitxategia ixtean"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Arazoa fitxategia sinkronizatzean"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Arazoa fitxategia desestekatzean"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Arazoa fitxategia sinkronizatzean"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortatu instalazioa."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Paketeen katxea hutsik"
@@ -2604,59 +2591,59 @@ msgstr "APT honek ez du '%s' bertsio sistema onartzen"
msgid "The package cache was built for a different architecture"
msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Mendekotasuna:"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Aurremendekotasuna:"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Iradokizuna:"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Gomendioa:"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Gatazka:"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Ordeztea:"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Zaharkitzea:"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Apurturik"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
-msgstr ""
+msgstr "Hobekuntzak"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "garrantzitsua"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "beharrezkoa"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "estandarra"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "aukerakoa"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "estra"
@@ -2756,12 +2743,12 @@ msgstr "%s irekitzen"
msgid "Line %u too long in source list %s."
msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
@@ -2802,7 +2789,7 @@ msgid ""
msgstr ""
"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2810,11 +2797,11 @@ msgstr ""
"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
"atxikitako paketeek eraginda."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2865,12 +2852,12 @@ msgstr "%s metodoa ez da behar bezala abiarazi"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' pakete sistema ez da onartzen"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Ezin da pakete sistemaren mota egokirik zehaztu"
@@ -2923,14 +2910,14 @@ msgstr "Katxearen bertsio sistema ez da bateragarria"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
@@ -2951,26 +2938,26 @@ msgstr "APT honek maneia dezakeen azalpen kopurua gainditu duzu."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Pakete Zerrenda irakurtzen"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Fitxategiaren erreferentziak biltzen"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "S/I errorea iturburu katxea gordetzean"
@@ -2983,53 +2970,53 @@ msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Egiaztapena ez dator bat"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3038,7 +3025,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3047,7 +3034,7 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3055,31 +3042,31 @@ msgstr ""
"Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Lerro baliogabea desbideratze fitxategian: %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
@@ -3177,22 +3164,22 @@ msgstr "Jatorri zerrenda berria idazten\n"
msgid "Source list entries for this disc are:\n"
msgstr "Diskoarentzako jatorri sarrerak:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i erregistro grabaturik.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i erregistro eta %i okerreko fitxategi grabaturik\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3208,6 +3195,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Egiaztapena ez dator bat"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortatu instalazioa."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3271,121 +3269,121 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s Instalatzen"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s konfiguratzen"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s kentzen"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s guztiz ezabatu da"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "'%s' direktorioa falta da"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "%s fitxategia ezin izan da ireki"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s irekitzen"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfiguratzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s Instalatuta"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s kentzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s kendurik"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s guztiz ezabatzeko prestatzen"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s guztiz ezabatu da"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago "
"muntaturik?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3397,7 +3395,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3427,6 +3431,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Eginda"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "%s konfigurazio fitxategia irekitzen"
diff --git a/po/fi.po b/po/fi.po
index 1637a9d97..8291af053 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " Versiotaulukko:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -445,7 +445,7 @@ msgstr "Paketilla %s ei ole asennettavaa valintaa"
#: cmdline/apt-get.cc:725
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "Virtuaalipaketteja, kuten ”%s”, ei voi poistaa\n"
#. TRANSLATORS: Note, this is not an interactive question
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -632,7 +632,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -682,7 +682,7 @@ msgstr ""
#: cmdline/apt-get.cc:1561
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Älä välitä puuttuvasta kohdejulkaisusta '%s' paketissa '%s'"
#: cmdline/apt-get.cc:1593
#, fuzzy, c-format
@@ -693,7 +693,7 @@ msgstr "stat ei toiminut lähdepakettiluettelolle %s"
#: cmdline/apt-get.cc:1631
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Älä välitä puuttuvasta versiosta '%s' paketissa '%s'"
#: cmdline/apt-get.cc:1647
msgid "The update command takes no arguments"
@@ -826,7 +826,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Ei onnistunut"
@@ -850,7 +850,7 @@ msgstr ""
#: cmdline/apt-get.cc:2393
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "Noudetaan %s %s"
#: cmdline/apt-get.cc:2453
msgid "Must specify at least one package to fetch source for"
@@ -867,6 +867,9 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
+"HUOM: \"%s\"-paketin paketointia ylläpidetään \"%s\"-"
+"versionhallintajärjestelmässä osoitteessa:\n"
+"%s\n"
#: cmdline/apt-get.cc:2515
#, c-format
@@ -1014,11 +1017,11 @@ msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
msgid "Changelog for %s (%s)"
msgstr "Avataan yhteys %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1104,7 +1107,7 @@ msgstr ""
"lisätietoja ja lisää valitsimia.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1175,8 +1178,7 @@ msgid "%s was already not hold.\n"
msgstr "%s on jo uusin versio.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
@@ -1314,8 +1316,8 @@ msgstr "Yhteys aikakatkaistiin"
msgid "Server closed the connection"
msgstr "Palvelin sulki yhteyden"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Lukuvirhe"
@@ -1328,8 +1330,8 @@ msgid "Protocol corruption"
msgstr "Yhteyskäytäntö on turmeltunut"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Virhe kirjoitettaessa"
@@ -1383,7 +1385,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1410,93 +1412,88 @@ msgstr "Kysely"
msgid "Unable to invoke "
msgstr "Käynnistys ei onnistu"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Avataan yhteys %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Yhteyden %s avaus ei onnistu: %s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Avataan yhteys %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nimeä \"%s\" ei voitu selvittää"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1536,53 +1533,53 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki"
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Sisäinen virhe"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Tiedostoa %s ei voi lukea"
@@ -1600,7 +1597,7 @@ msgstr "Kansioon %s vaihto ei onnistu"
#: methods/mirror.cc:280
#, c-format
msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "Peilitiedostoa \"%s\" ei löydy "
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
@@ -1612,7 +1609,7 @@ msgstr "Tiedostoa %s ei voitu avata"
#: methods/mirror.cc:442
#, c-format
msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[Peili: %s]"
#: methods/rred.cc:491
#, c-format
@@ -1704,7 +1701,7 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
@@ -1853,8 +1850,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Tietokantatiedostoa %s ei saatu avattua: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Tiedostolle %s ei toimi stat"
@@ -1867,87 +1864,87 @@ msgstr "Arkistolla ei ole ohjaustietuetta"
msgid "Unable to get a cursor"
msgstr "Kohdistinta ei saada"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kansiota %s ei voi lukea\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Tdstolle %s ei toimi stat\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Tiedostossa virheitä "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Osoitteen %s selvitys ei onnistunut"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Puun läpikäynti ei onnistunut"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Tiedoston %s avaaminen ei onnistunut"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ei onnistunut"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ei onnistunut"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linkin %s -> %s luonti ei onnistunut"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLinkin yläraja %st saavutettu.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n"
@@ -2021,7 +2018,7 @@ msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä"
msgid "Problem unlinking %s"
msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
@@ -2166,54 +2163,54 @@ msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
msgid "Failed to close file %s"
msgstr "Tiedoston %s sulkeminen ei onnistunut"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Polku %s on liian pitkä"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Purettiin %s useammin kuin kerran"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Kansio %s on korvautunut"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Korvautuspolku on liian pitkä"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Solmua ei löytynyt sen hajautuslokerosta"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Polku on liian pitkä"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Tiedostolle %s ei toimi stat"
@@ -2293,30 +2290,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Valintaa %s ei löydy"
@@ -2386,16 +2383,6 @@ msgstr "%c%s... Virhe!"
msgid "%c%s... Done"
msgstr "%c%s... Valmis"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Valmis"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2507,69 +2494,63 @@ msgstr "Aliprosessi %s aiheutti suojausvirheen."
msgid "Sub-process %s received signal %u."
msgstr "Aliprosessi %s aiheutti suojausvirheen."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Aliprosessi %s palautti virhekoodin (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Aliprosessi %s lopetti odottamatta"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Tiedostoa %s ei voitu avata"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Putkea %s ei voitu avata"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Pakkaajan käynnistäminen ei onnistunut"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Pulmia tiedoston sulkemisessa"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Pulmia tehtäessä tiedostolle sync"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Pulmia tehtäessä tiedostolle unlink"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Pulmia tehtäessä tiedostolle sync"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Asennus keskeytetään."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Pakettivarasto on tyhjä"
@@ -2596,59 +2577,59 @@ msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\""
msgid "The package cache was built for a different architecture"
msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Riippuvuudet"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Esiriippuvuudet"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Ehdotukset"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Suosittelut"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Ristiriidat"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Korvaavuudet"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Täydet korvaavuudet"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Rikkoo"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
-msgstr ""
+msgstr "Parantaa"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "tärkeä"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "välttämätön"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "perus"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "valinnainen"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "ylimääräinen"
@@ -2748,12 +2729,12 @@ msgstr "Avataan %s"
msgid "Line %u too long in source list %s."
msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
@@ -2792,7 +2773,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:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2800,11 +2781,11 @@ msgstr ""
"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
"paketit."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2855,12 +2836,12 @@ msgstr "Menetelmä %s ei käynnistynyt oikein"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
@@ -2914,14 +2895,14 @@ msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
@@ -2943,26 +2924,26 @@ msgstr "Jummijammi, tämä APT ei osaa käsitellä noin montaa kuvausta."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia."
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Luetaan pakettiluetteloita"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Kootaan tiedostojen tarjoamistietoja"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
@@ -2975,53 +2956,53 @@ msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Tarkistussumma ei täsmää"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "GPG-virhe: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3030,7 +3011,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:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3039,7 +3020,7 @@ msgstr ""
"Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
"tämän paketin itse."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3047,31 +3028,31 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Koko ei täsmää"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Huomautus, valitaan %s eikä %s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Virheellinen rivi korvautustiedostossa: %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
@@ -3169,22 +3150,22 @@ msgstr "Kirjoitetaan uusi lähdeluettelo\n"
msgid "Source list entries for this disc are:\n"
msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Kirjoitettiin %i tietuetta.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3201,6 +3182,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Kohteen %s tarkistussumma ei täsmää"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Asennus keskeytetään."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3264,121 +3256,121 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Asennetaan %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Tehdään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Poistetaan %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s poistettiin kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "Huomautus paketin %s katoamisesta"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Suoritetaan jälkiasennusliipaisin %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Kansio \"%s\" puuttuu."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Tiedostoa %s ei voitu avata"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Valmistellaan %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Puretaan %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Valmistaudutaan tekemään asetukset: %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s asennettu"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Valmistaudutaan poistamaan %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s poistettu"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Valmistaudutaan poistamaan %s kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s poistettiin kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts "
"liittämättä?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
-msgstr ""
+msgstr "Suoritetaan dpkg-ohjelmaa"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "riippuvuusongelmia - jätetään asetukset säätämättä"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3390,7 +3382,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3417,7 +3415,15 @@ msgstr ""
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
-msgstr ""
+msgstr "Ei lukittu"
+
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Valmis"
#, fuzzy
#~ msgid "Skipping nonexistent file %s"
diff --git a/po/fr.po b/po/fr.po
index 835c0b206..24856be6c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2013-04-09 07:58+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -155,7 +155,7 @@ msgid " Version table:"
msgstr " Table de version :"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -648,7 +648,7 @@ msgstr "Annulation."
msgid "Do you want to continue [Y/n]? "
msgstr "Souhaitez-vous continuer [O/n] ? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de récupérer %s %s\n"
@@ -851,7 +851,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Calcul de la mise à jour... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Échec"
@@ -1058,11 +1058,11 @@ msgstr "Impossible d'activer les dépendances de construction"
msgid "Changelog for %s (%s)"
msgstr "Journal des modifications pour %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Modules reconnus :"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1152,7 +1152,7 @@ msgstr ""
"apt.conf(5) pour plus d'informations et d'options.\n"
" Cet APT a les « Super Cow Powers »\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1229,8 +1229,7 @@ msgid "%s was already not hold.\n"
msgstr "%s était déjà marqué comme non figé.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "A attendu %s mais il n'était pas présent"
@@ -1395,8 +1394,8 @@ msgstr "Dépassement du délai de connexion"
msgid "Server closed the connection"
msgstr "Le serveur a fermé la connexion"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Erreur de lecture"
@@ -1409,8 +1408,8 @@ msgid "Protocol corruption"
msgstr "Corruption du protocole"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Erreur d'écriture"
@@ -1465,7 +1464,7 @@ msgstr "Délai de connexion au port de données dépassé"
msgid "Unable to accept connection"
msgstr "Impossible d'accepter une connexion"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problème de hachage du fichier"
@@ -1492,96 +1491,91 @@ msgstr "Requête"
msgid "Unable to invoke "
msgstr "Impossible d'invoquer "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Connexion à %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP : %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Impossible d'initialiser la connexion à %s: %s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Connexion à %s: %s (%s) impossible."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Connexion à %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ne parvient pas à résoudre « %s »"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Erreur temporaire de résolution de « %s »"
-#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Erreur système lors de la résolution de « %s:%s »"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
"Quelque chose d'imprévisible est survenu lors de la détermination de « %s:"
"%s » (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Impossible de se connecter à %s:%s :"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erreur interne : signature correcte, mais il est impossible de déterminer "
"l'empreinte de la clé."
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Au moins une signature non valable a été rencontrée."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Impossible d'exécuter « gpgv » pour contrôler la signature (veuillez "
"vérifier si gpgv est installé)."
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Erreur inconnue à l'exécution de gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Les signatures suivantes ne sont pas valables :\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1621,53 +1615,53 @@ msgstr "Ce serveur http possède un support des limites non-valide"
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Sélection défaillante"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Délai de connexion dépassé"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Erreur d'écriture du fichier de sortie"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Erreur d'écriture sur un fichier"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Erreur d'écriture sur le fichier"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Mauvais en-tête de donnée"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Échec de la connexion"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Erreur interne"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Impossible de lire %s"
@@ -1793,7 +1787,7 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Impossible d'écrire sur %s"
@@ -1943,8 +1937,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Impossible d'ouvrir le fichier de base de données %s : %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Impossible de statuer %s"
@@ -1957,87 +1951,87 @@ msgstr "L'archive n'a pas d'enregistrement de contrôle"
msgid "Unable to get a cursor"
msgstr "Impossible d'obtenir un curseur"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A : Impossible de lire le contenu du répertoire %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A : Impossible de statuer %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E : "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A : "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E : des erreurs sont survenues sur le fichier "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Impossible de résoudre %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Échec du parcours de l'arbre"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Impossible d'ouvrir %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Délier %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Impossible de lire le lien %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Impossible de délier %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Impossible de lier %s à %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Seuil de delink de %so atteint.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "L'archive ne possède pas de champ de paquet"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ne possède pas d'entrée « override »\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " le responsable de %s est %s et non %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ne possède pas d'entrée « source override »\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ne possède pas également pas d'entrée « binary override »\n"
@@ -2111,7 +2105,7 @@ msgstr "Impossible de lire lors du calcul de la somme MD5"
msgid "Problem unlinking %s"
msgstr "Problème en déliant %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Impossible de changer le nom %s en %s"
@@ -2259,54 +2253,54 @@ msgstr "Erreur d'écriture du fichier %s"
msgid "Failed to close file %s"
msgstr "Échec de clôture du fichier %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Le chemin %s est trop long"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Veuillez décompresser %s plus d'une fois"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Le répertoire %s est détourné"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Le paquet est en train d'essayer d'écrire sur la cible détournée %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Le chemin de déviation est trop long"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Le répertoire %s va être remplacé par un non-répertoire"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Échec pour localiser le nœud dans la table de hachage"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Le chemin est trop long"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Écrase la correspondance de paquet sans version pour %s "
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Impossible de statuer pour %s."
@@ -2391,30 +2385,30 @@ msgstr ""
"automatique a été désactivée par une option utilisateur."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "La sélection %s n'a pu être trouvée"
@@ -2488,16 +2482,6 @@ msgstr "%c%s... Erreur !"
msgid "%c%s... Done"
msgstr "%c%s... Fait"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "…"
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s… %u%%"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2617,69 +2601,63 @@ msgstr "Le sous-processus %s a commis une violation d'accès mémoire"
msgid "Sub-process %s received signal %u."
msgstr "Le sous-processus %s a reçu le signal %u"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Le sous-processus %s s'est arrêté prématurément"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Impossible d'ouvrir le fichier %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Impossible d'ouvrir le descripteur de fichier %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Impossible de créer un sous-processus IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Impossible d'exécuter la compression "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "lu(s), %llu restant à lire, mais rien n'est disponible"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problème de fermeture du fichier %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problème de renommage du fichier %s en %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problème de suppression du lien %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problème de synchronisation du fichier"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Pas de porte-clés installé dans %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache des paquets vide"
@@ -2705,59 +2683,59 @@ msgstr "Cet APT ne supporte pas le système de version « %s »"
msgid "The package cache was built for a different architecture"
msgstr "Le cache des paquets a été construit pour une architecture différente"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Dépend"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Pré-Dépend"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Suggère"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Recommande"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Est en conflit avec"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Remplace"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Rend obsolète"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Casse"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Améliore"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "important"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "nécessaire"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "optionnel"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "supplémentaire"
@@ -2867,12 +2845,12 @@ msgstr "Ouverture de %s"
msgid "Line %u too long in source list %s."
msgstr "La ligne %u du fichier des listes de sources %s est trop longue."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
@@ -2918,7 +2896,7 @@ msgstr ""
"Le paquet %s doit être réinstallé, mais il est impossible de trouver son "
"archive."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2926,13 +2904,13 @@ msgstr ""
"Erreur, pkgProblem::Resolve a généré des ruptures, ce qui a pu être causé "
"par les paquets devant être gardés en l'état."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
"« garder en l'état »."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2984,12 +2962,12 @@ msgstr ""
"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
"touche Entrée."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Le système de paquet « %s » n'est pas supporté"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossible de déterminer un type du système de paquets adéquat"
@@ -3049,14 +3027,14 @@ msgstr "Le cache possède un système de version incompatible"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Erreur apparue lors du traitement de %s (%s%d)"
@@ -3085,28 +3063,28 @@ msgstr ""
"Vous avez dépassé le nombre de dépendances que cette version d'APT est "
"capable de traiter."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Le paquet %s %s n'a pu être trouvé lors du traitement des dépendances des "
"fichiers"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Impossible de localiser la liste des paquets sources %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Lecture des listes de paquets"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Assemblage des fichiers listés dans les champs Provides"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr ""
"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
@@ -3120,12 +3098,12 @@ msgstr "impossible de changer le nom, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Somme de contrôle MD5 incohérente"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Somme de contrôle de hachage incohérente"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3134,18 +3112,18 @@ msgstr ""
"Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : "
" ligne non valable dans sources.list ou fichier corrompu"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
"Impossible de trouver la comme de contrôle de « %s » dans le fichier Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3154,15 +3132,15 @@ msgstr ""
"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
"à jour depuis ce dépôt ne s'effectueront pas."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est "
@@ -3170,12 +3148,12 @@ msgstr ""
"GPG : %s : %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erreur de GPG : %s : %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3184,7 +3162,7 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même (absence d'architecture)."
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3193,7 +3171,7 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3201,31 +3179,31 @@ msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
"pour le paquet %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Taille incohérente"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossible d'analyser le fichier Release %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Pas de sections dans le fichier Release %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Pas d'entrée de hachage dans le fichier Release %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrée « Date » non valable dans le fichier Release %s"
@@ -3325,22 +3303,22 @@ msgstr "Écriture de la nouvelle liste de sources\n"
msgid "Source list entries for this disc are:\n"
msgstr "Les entrées de listes de sources pour ce disque sont :\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i enregistrements écrits.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i enregistrements écrits avec %i fichiers manquants.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i enregistrements écrits avec %i fichiers qui ne correspondent pas\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3357,6 +3335,17 @@ msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
msgid "Hash mismatch for: %s"
msgstr "Somme de contrôle de hachage incohérente pour %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Le fichier %s ne commence pas par un message signé en clair."
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Pas de porte-clés installé dans %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3431,115 +3420,115 @@ msgstr "Préparation à la réception de la solution"
msgid "External solver failed without a proper error message"
msgstr "Échec du solveur externe sans message d'erreur adapté"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Exécu tion du solveur externe"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installation de %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Suppression complète de %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Disparition de %s constatée"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Exécution des actions différées (« trigger ») de %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Répertoire %s inexistant"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Impossible d'ouvrir le fichier « %s »"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Préparation de %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Décompression de %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Préparation de la configuration de %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s installé"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Préparation de la suppression de %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s supprimé"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Préparation de la suppression complète de %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s complètement supprimé"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Impossible d'écrire le journal, échec d'openpty()\n"
"(/dev/pts est-il monté ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Exécution de dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "L'opération a été interrompue avant de se terminer"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "problème de dépendances : laissé non configuré"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3547,7 +3536,7 @@ msgstr ""
"Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
"erreur consécutive à un échec précédent."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3562,7 +3551,15 @@ msgstr ""
"Aucun « apport » n'a été créé car une erreur de dépassement de capacité "
"mémoire a été signalée"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Aucun rapport apport n'a été écrit car le message d'erreur indique un "
+"problème sur le système local"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3599,8 +3596,22 @@ msgstr ""
msgid "Not locked"
msgstr "Non verrouillé"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Le fichier %s ne commence pas par un message signé en clair."
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Erreur système lors de la résolution de « %s:%s »"
+
+#~ msgid "..."
+#~ msgstr "…"
+
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s… %u%%"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Une erreur s'est produite lors du contrôle de la signature. Le dépôt "
+#~ "n'est pas mis à jour et les fichiers d'index précédents seront utilisés. "
+#~ "Erreur de GPG : %s : %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Fichier %s inexistant ignoré"
diff --git a/po/gl.po b/po/gl.po
index 12125eb54..d95374203 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -112,7 +112,7 @@ msgstr "Debe fornecer cando menos un patrón de busca"
#: cmdline/apt-cache.cc:1361
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "Esta orde é obsoleta. Use «apt-mark showauto» no seu canto."
#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
#, c-format
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr " Táboa de versións:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -297,7 +297,7 @@ msgstr "S"
#: cmdline/apt-get.cc:140
msgid "N"
-msgstr ""
+msgstr "N"
#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
#, c-format
@@ -639,7 +639,7 @@ msgstr "Interromper."
msgid "Do you want to continue [Y/n]? "
msgstr "Quere continuar [S/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non foi posíbel obter %s %s\n"
@@ -831,12 +831,13 @@ msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
+"Esta orde é obsoleta. Use «apt-mark auto» e «apt-mark manual» no seu canto."
#: cmdline/apt-get.cc:2185
msgid "Calculating upgrade... "
msgstr "Calculando a anovación... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Fallou"
@@ -961,6 +962,8 @@ msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"Non hai dispoñíbel información da arquitectura para %s. Vea apt.conf(5) APT::"
+"Architectures para configurar"
#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
#, c-format
@@ -1034,11 +1037,11 @@ msgstr "Non se puideron procesar as dependencias de construción"
msgid "Changelog for %s (%s)"
msgstr "Rexistro de cambios de %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Módulos admitidos:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1131,7 +1134,7 @@ msgstr ""
"para obter mais información e opcións\n"
" Este APT ten poderes da Super Vaca.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1207,8 +1210,7 @@ msgid "%s was already not hold.\n"
msgstr "%s xa é a versión máis recente.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Agardouse por %s pero non estaba alí"
@@ -1225,7 +1227,7 @@ msgstr "Non foi posíbel abrir %s"
#: cmdline/apt-mark.cc:332
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Non foi posíbel executar dpkg. Vostede é administrador (root)?"
#: cmdline/apt-mark.cc:379
msgid ""
@@ -1346,8 +1348,8 @@ msgstr "Esgotouse o tempo para a conexión"
msgid "Server closed the connection"
msgstr "O servidor pechou a conexión"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Produciuse un erro de lectura"
@@ -1360,8 +1362,8 @@ msgid "Protocol corruption"
msgstr "Dano no protocolo"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Produciuse un erro de escritura"
@@ -1416,7 +1418,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
msgid "Unable to accept connection"
msgstr "Non é posíbel aceptar a conexión"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Xurdiu un problema ao calcular o hash do ficheiro"
@@ -1443,94 +1445,89 @@ msgstr "Petición"
msgid "Unable to invoke "
msgstr "Non é posíbel chamar a "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectando a %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Non foi posíbel crear un socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Non é posíbel iniciar a conexión a %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Non foi posíbel conectar a %s:%s (%s), a conexión esgotou o tempo"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Non foi posíbel conectar a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Non foi posíbel atopar «%s»"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Produciuse un fallo temporal ao buscar «%s»"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Non é posíbel conectar %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada "
"dixital da chave"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Atopouse polo menos unha sinatura incorrecta."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado "
"gpgv?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Produciuse un erro descoñecido ao executar gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "As seguintes sinaturas non eran correctas:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1571,54 +1568,54 @@ msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada"
msgid "Unknown date format"
msgstr "Formato de datos descoñecido"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Fallou a chamada a select"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "A conexión esgotou o tempo"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Produciuse un erro ao escribir no ficheiro de saída"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Produciuse un erro ao escribir nun ficheiro"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Produciuse un erro ao escribir no ficheiro"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Produciuse un erro ao ler do servidor"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Datos da cabeceira incorrectos"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Produciuse un fallo na conexión"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Produciuse un erro interno"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Non é posíbel ler %s"
@@ -1743,7 +1740,7 @@ msgstr ""
" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Non é posíbel escribir en %s"
@@ -1891,8 +1888,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Non é posíbel abrir o ficheiro de base de datos %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Non foi posíbel determinar o estado %s"
@@ -1905,87 +1902,87 @@ msgstr "O arquivo non ten un rexistro de control"
msgid "Unable to get a cursor"
msgstr "Non é posíbel obter un cursor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: non é posíbel ler o directorio %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: non é posíbel atopar %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: os erros aplícanse ao ficheiro "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Non foi posíbel solucionar %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Fallou o percorrido da árbore"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Non foi posíbel abrir %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DesLig %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Non foi posíbel ler a ligazón %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Non foi posíbel desligar %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Non foi posíbel ligar %s con %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Acadouse o límite de desligado de %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "O arquivo non tiña un campo Package"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ten unha entrada de «override»\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " O mantedor de %s é %s, non %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ten unha entrada de «override» de código fonte\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampouco ten unha entrada de «override» de binarios\n"
@@ -2059,7 +2056,7 @@ msgstr "Non foi posíbel ler ao calcular o MD5"
msgid "Problem unlinking %s"
msgstr "Xurdiu un problema ao desligar %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Non foi posíbel cambiar o nome de %s a %s"
@@ -2206,54 +2203,54 @@ msgstr "Non foi posíbel escribir no ficheiro «%s»"
msgid "Failed to close file %s"
msgstr "Non foi posíbel pechar o ficheiro %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "A ruta %s é longa de máis"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Desempaquetando %s máis dunha vez"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "O directorio %s está desviado"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "O paquete tenta escribir no destino do desvío %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "A ruta do desvío é longa de máis"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "O directorio %s estase a substituír por algo que non é un directorio"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Non foi posíbel atopar o nodo no seu contedor hash"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "A ruta é longa de máis"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Coincidencia na sobrescritura sen versión para %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "O ficheiro %s/%s sobrescribe o do paquete %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Non é posíbel determinar o estado %s"
@@ -2336,30 +2333,30 @@ msgstr ""
"desactivado polo usuario."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Non se atopou a selección %s"
@@ -2433,16 +2430,6 @@ msgstr "%c%s... Erro!"
msgid "%c%s... Done"
msgstr "%c%s... Feito"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Feito"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2558,69 +2545,63 @@ msgstr "O subproceso %s recibiu un fallo de segmento."
msgid "Sub-process %s received signal %u."
msgstr "O subproceso %s recibiu o sinal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "O subproceso %s devolveu un código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O subproceso %s saíu de xeito inesperado"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Non foi posíbel abrir o ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Non foi posíbel abrir o descritor de ficheiro %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Non foi posíbel crear o IPC do subproceso"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Non foi posíbel executar o compresor "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "escritura, aínda hai %lu para escribir pero non se puido"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Produciuse un problema ao pechar o ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Produciuse un problema ao renomear o ficheiro %s a %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Produciuse un problema ao desligar o ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Produciuse un problema ao sincronizar o ficheiro"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Non ha ningún chaveiro instalado en %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Caché de paquetes baleira"
@@ -2647,59 +2628,59 @@ msgstr "Este APT non admite o sistema de versionado «%s»"
msgid "The package cache was built for a different architecture"
msgstr "A caché de paquetes construíuse para unha arquitectura diferente"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Depende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "PreDepende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Suxire"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Recomenda"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Conflitos"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Substitúe a"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Fai obsoleto a"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Estraga"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Mellora"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "requirido"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "estándar"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2803,12 +2784,12 @@ msgstr "Abrindo %s"
msgid "Line %u too long in source list %s."
msgstr "Liña %u longa de máis na lista de orixes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
@@ -2851,7 +2832,7 @@ msgstr ""
"O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu "
"arquivo."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2859,11 +2840,11 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar "
"causado por paquetes retidos."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2914,12 +2895,12 @@ msgstr "O método %s non se iniciou correctamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "O sistema de empaquetado «%s» non está admitido"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Non é posíbel determinar un tipo de sistema de empaquetado axeitado"
@@ -2952,6 +2933,8 @@ msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"O valor «%s» non é válido para APT::Default-Release xa que esa versión non "
+"está dispoñíbel nas orixes"
#: apt-pkg/policy.cc:399
#, c-format
@@ -2976,14 +2959,14 @@ msgstr "A caché ten un sistema de versionado incompatíbel"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Produciuse un erro ao procesar %s (FindPkg)"
@@ -3005,28 +2988,28 @@ msgstr "Vaites!, superou o número de descricións que este APT pode manexar."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Vaites!, superou o número de dependencias que este APT pode manexar."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de "
"ficheiros"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Non foi posíbel atopar a lista de paquetes fonte %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Lendo as listas de paquetes"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Recollendo as provisións de ficheiros"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
@@ -3039,12 +3022,12 @@ msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "A MD5Sum non coincide"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "A sumas «hash» non coinciden"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3053,32 +3036,34 @@ msgstr ""
"Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación "
"(entrada sources.list incorrecta ou ficheiro con formato incorrecto)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
"Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"O ficheiro de publicación de %s caducou (non válido desde %s). Non se "
+"aplicarán as actualizacións deste repositorio."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Produciuse un erro durante a verificación da sinatura. O repositorio non foi "
@@ -3086,12 +3071,12 @@ msgstr ""
"%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Produciuse un erro de GPG: %s %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3100,7 +3085,7 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falta a arquitectura)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3109,7 +3094,7 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3117,31 +3102,31 @@ msgstr ""
"Os ficheiros de índices de paquetes están danados. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Non se puido analizar o ficheiro de publicación %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Non hai seccións no ficheiro de publicación %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Non hai entrada de Hash no ficheiro de publicación %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
@@ -3241,22 +3226,22 @@ msgstr "Escribindo a nova lista de orixes\n"
msgid "Source list entries for this disc are:\n"
msgstr "As entradas da lista de orixes deste disco son:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Escribíronse %i rexistros.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Escribíronse %i rexistros con %i ficheiros que faltan.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Escribíronse %i rexistros con %i ficheiros que non coinciden\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3273,6 +3258,17 @@ msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
msgid "Hash mismatch for: %s"
msgstr "Valor de hash non coincidente para: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "O ficheiro %s non comeza cunha mensaxe de sinatura limpa"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Non ha ningún chaveiro instalado en %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3332,131 +3328,132 @@ msgstr ""
#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
msgid "Send scenario to solver"
-msgstr ""
+msgstr "Enviar escenario ao resolvedor"
#: apt-pkg/edsp.cc:209
msgid "Send request to solver"
-msgstr ""
+msgstr "Enviar petición ao resolvedor"
#: apt-pkg/edsp.cc:279
msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Preparar para recibir solución"
#: apt-pkg/edsp.cc:286
msgid "External solver failed without a proper error message"
msgstr ""
+"produciuse un fallo no resolvedor externo sen unha mensaxe de erro axeitada"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
-msgstr ""
+msgstr "Executar o resolvedor externo"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Retirando %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s completamente retirado"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Tomando nota da desaparición de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Executando o disparador de post-instalación %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta o directorio «%s»"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Non foi posíbel abrir o ficheiro «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Desempaquetando %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparandose para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Instalouse %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparándose para o retirado de %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Retirouse %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparándose para retirar %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Retirouse %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Non foi posíbel escribir no rexistro, a chamada a openpty() fallou (/dev/pts "
"non estaba montado?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Executando dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Non se escribiu ningún informe de Apport porque xa se acadou o nivel "
"MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependencias - déixase sen configurar"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3464,7 +3461,7 @@ msgstr ""
"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que "
"é un error provinte dun fallo anterior."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3480,7 +3477,15 @@ msgstr ""
"Non se escribiu un informe de contribución porque a mensaxe de erro indica "
"un erro de falta de memoria"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Non hai un informe de «apport» escrito, xa que a mensaxe de erro indica un "
+"problema no sistema local"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3516,6 +3521,22 @@ msgstr ""
msgid "Not locked"
msgstr "Non está bloqueado"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Feito"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Produciuse un erro durante a verificación da sinatura. O repositorio non "
+#~ "foi actualizado, empregaranse os ficheiros de índice anteriores. Erro de "
+#~ "GPG: %s: %s\n"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Omitindo o ficheiro inexistente %s"
diff --git a/po/he.po b/po/he.po
index a2e3cba60..d86267ed4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,163 +6,169 @@
msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 19:13+0100\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2012-10-15 09:49+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"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:158
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "לחבילה %s בגרסה %s יש תלויות שלא נענו:\n"
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "לא מצליח לאתר את החבילה %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:286
msgid "Total package names: "
-msgstr ""
+msgstr "Total package names: "
+
+#: cmdline/apt-cache.cc:288
+msgid "Total package structures: "
+msgstr "Total package structures: "
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:328
msgid " Normal packages: "
msgstr "חבילות נורמליות:"
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:329
msgid " Pure virtual packages: "
msgstr "חבילות וירטואליות לחלוטין:"
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:330
msgid " Single virtual packages: "
-msgstr ""
+msgstr " Single virtual packages: "
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:331
msgid " Mixed virtual packages: "
-msgstr ""
+msgstr " Mixed virtual packages: "
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:332
msgid " Missing: "
msgstr "חסרות:"
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:334
msgid "Total distinct versions: "
-msgstr ""
+msgstr "Total distinct versions: "
-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:336
msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "Total distinct descriptions: "
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:338
msgid "Total dependencies: "
-msgstr ""
+msgstr "Total dependencies: "
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:341
msgid "Total ver/file relations: "
-msgstr ""
+msgstr "Total ver/file relations: "
-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:343
msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "Total Desc/File relations: "
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:345
msgid "Total Provides mappings: "
-msgstr ""
+msgstr "Total Provides mappings: "
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:357
msgid "Total globbed strings: "
-msgstr ""
+msgstr "Total globbed strings: "
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:371
msgid "Total dependency version space: "
-msgstr ""
+msgstr "Total dependency version space: "
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:376
msgid "Total slack space: "
-msgstr ""
+msgstr "Total slack space: "
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:384
msgid "Total space accounted for: "
-msgstr ""
+msgstr "Total space accounted for: "
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147
#, c-format
msgid "Package file %s is out of sync."
msgstr "קובץ החבילה %s לא מסונכרן."
-#: cmdline/apt-cache.cc:1297
-msgid "You must give exactly one pattern"
-msgstr "אתה חייב לתת בדיוק תבנית אחת"
-
-#: cmdline/apt-cache.cc:1451
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
+#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
+#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
msgid "No packages found"
msgstr "לא נמצאו חבילות"
-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1226
+msgid "You must give at least one search pattern"
+msgstr "You must give at least one search pattern"
+
+#: cmdline/apt-cache.cc:1361
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+msgstr ""
+
+#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "לא מצליח לאתר את החבילה %s"
+
+#: cmdline/apt-cache.cc:1486
msgid "Package files:"
msgstr "קבצי חבילה:"
-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
+msgstr "Cache is out of sync, can't x-ref a package file"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1549
+#: cmdline/apt-cache.cc:1507
msgid "Pinned packages:"
msgstr "חבילות נעוצות:"
-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
msgid "(not found)"
msgstr "(לא נמצא)"
-#. Installed version
-#: cmdline/apt-cache.cc:1582
+#: cmdline/apt-cache.cc:1527
msgid " Installed: "
msgstr "מותקן:"
-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
-msgid "(none)"
-msgstr "(none)"
-
-#. Candidate Version
-#: cmdline/apt-cache.cc:1589
+#: cmdline/apt-cache.cc:1528
msgid " Candidate: "
msgstr "מועמדים:"
-#: cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
+msgid "(none)"
+msgstr "(none)"
+
+#: cmdline/apt-cache.cc:1561
msgid " Package pin: "
msgstr "נעץ חבילה:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1570
msgid " Version table:"
-msgstr ""
+msgstr " Version table:"
-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
+#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1690
msgid ""
"Usage: apt-cache [options] command\n"
-" apt-cache [options] add file1 [file2 ...]\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
"\n"
-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
+"apt-cache is a low-level tool used to query information\n"
+"from APT's binary cache files\n"
"\n"
"Commands:\n"
-" add - Add a package file to the source cache\n"
" gencaches - Build both the package and source cache\n"
" showpkg - Show some general information for a single package\n"
" showsrc - Show source records\n"
@@ -190,23 +196,28 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
+msgstr "Please insert a Disc in the drive and press enter"
-#: cmdline/apt-cdrom.cc:114
+#: cmdline/apt-cdrom.cc:129
+#, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "Failed to mount '%s' to '%s'"
+
+#: cmdline/apt-cdrom.cc:163
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Repeat this process for the rest of the CDs in your set."
-#: cmdline/apt-config.cc:41
+#: cmdline/apt-config.cc:46
msgid "Arguments not in pairs"
-msgstr ""
+msgstr "Arguments not in pairs"
-#: cmdline/apt-config.cc:76
+#: cmdline/apt-config.cc:87
msgid ""
"Usage: apt-config [options] command\n"
"\n"
@@ -221,398 +232,96 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s הוא לא חבילת DEB תקינה."
-
-#: cmdline/apt-extracttemplates.cc:232
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"Usage: apt-config [options] command\n"
"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
"\n"
"Options:\n"
-" -h This help text\n"
-" -t Set the temp dir\n"
+" -h This help text.\n"
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
-#, c-format
-msgid "Unable to write to %s"
-msgstr "לא מצליח לכתוב ל-%s"
-
-#: cmdline/apt-extracttemplates.cc:310
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "לא מצליח לקבל את גרסת debconf. האם debconf מותקן?"
-
-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
-msgid "Package extension list is too long"
-msgstr ""
-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
-#, c-format
-msgid "Error processing directory %s"
-msgstr "שגיאה בעיבוד ספריה %s"
-
-#: ftparchive/apt-ftparchive.cc:251
-msgid "Source extension list is too long"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:368
-msgid "Error writing header to contents file"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:398
-#, c-format
-msgid "Error processing contents %s"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:553
-msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-" sources srcpath [overridefile [pathprefix]]\n"
-" contents path\n"
-" release path\n"
-" generate config [groups]\n"
-" clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" --md5 Control MD5 generation\n"
-" -s=? Source override file\n"
-" -q Quiet\n"
-" -d=? Select the optional caching database\n"
-" --no-delink Enable delinking debug mode\n"
-" --contents Control contents file generation\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option"
-msgstr ""
-
-#: ftparchive/apt-ftparchive.cc:759
-msgid "No selections matched"
-msgstr "אין התאמות"
-
-#: ftparchive/apt-ftparchive.cc:832
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "חלק מהקבצים חסרים בקבוצת קבצי החבילה `%s'"
-
-#: ftparchive/cachedb.cc:43
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "מסד הנתונים אינו תקין, הקובץ הועבר ל-%s.old"
-
-#: ftparchive/cachedb.cc:61
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "מסד הנתונים ישן, מנסה לשדרג ל-%s"
-
-#: ftparchive/cachedb.cc:72
-msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
-"remove and re-create the database."
-msgstr ""
-
-#: ftparchive/cachedb.cc:77
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "לא מצליח לפתוח את קובץ מסד הנתונים %s: %s"
-
-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/cachedb.cc:238
-msgid "Archive has no control record"
-msgstr ""
-
-#: ftparchive/cachedb.cc:444
-msgid "Unable to get a cursor"
-msgstr ""
-
-#: ftparchive/writer.cc:76
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "W: לא מצליח לקרוא את הספריה %s\n"
-
-#: ftparchive/writer.cc:81
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr ""
-
-#: ftparchive/writer.cc:132
-msgid "E: "
-msgstr "E: "
-
-#: ftparchive/writer.cc:134
-msgid "W: "
-msgstr "W: "
-
-#: ftparchive/writer.cc:141
-msgid "E: Errors apply to file "
-msgstr "E: שגיאות תקפות לקובץ"
-
-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "כשלון בפענוח %s"
-
-#: ftparchive/writer.cc:170
-msgid "Tree walking failed"
-msgstr ""
-
-#: ftparchive/writer.cc:195
-#, c-format
-msgid "Failed to open %s"
-msgstr "כשלון בפתיחת %s"
-
-#: ftparchive/writer.cc:254
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr ""
-
-#: ftparchive/writer.cc:262
-#, c-format
-msgid "Failed to readlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:266
-#, c-format
-msgid "Failed to unlink %s"
-msgstr ""
-
-#: ftparchive/writer.cc:273
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** כשלון בקישור %s ל-%s"
-
-#: ftparchive/writer.cc:283
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr ""
-
-#: ftparchive/writer.cc:388
-msgid "Archive had no package field"
-msgstr ""
-
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
-#, c-format
-msgid " %s has no override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
-#, c-format
-msgid " %s maintainer is %s not %s\n"
-msgstr "המתחזק של %s הוא %s ולא %s\n"
-
-#: ftparchive/writer.cc:637
-#, c-format
-msgid " %s has no source override entry\n"
-msgstr ""
-
-#: ftparchive/writer.cc:641
-#, c-format
-msgid " %s has no binary override entry either\n"
-msgstr ""
-
-#: ftparchive/contents.cc:321
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr ""
-
-#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - כשלון בהקצאת זיכרון"
-
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "לא מצליח לפתוח את %s"
-
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr ""
-
-#: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr ""
-
-#: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr ""
-
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:72
-#, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' אלגוריתם דחיה לא ידוע"
-
-#: ftparchive/multicompress.cc:102
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr ""
-
-#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr ""
-
-#: ftparchive/multicompress.cc:195
-msgid "Failed to create FILE*"
-msgstr ""
-
-#: ftparchive/multicompress.cc:198
-msgid "Failed to fork"
-msgstr "כשלון בביצוע fork"
-
-#: ftparchive/multicompress.cc:212
-msgid "Compress child"
-msgstr ""
-
-#: ftparchive/multicompress.cc:235
-#, c-format
-msgid "Internal error, failed to create %s"
-msgstr "שגיאה פנימית, כלשון ביצירת %s"
-
-#: ftparchive/multicompress.cc:286
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: ftparchive/multicompress.cc:321
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: ftparchive/multicompress.cc:360
-msgid "decompressor"
-msgstr ""
-
-#: ftparchive/multicompress.cc:403
-msgid "IO to subprocess/file failed"
-msgstr ""
-
-#: ftparchive/multicompress.cc:455
-msgid "Failed to read while computing MD5"
-msgstr ""
-
-#: ftparchive/multicompress.cc:472
-#, c-format
-msgid "Problem unlinking %s"
-msgstr ""
-
-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "כשלון בשינוי השם %s ל-%s"
-
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:135
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
-msgstr ""
+msgstr "Regex compilation error - %s"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:260
msgid "The following packages have unmet dependencies:"
msgstr "לחבילות הבאות יש תלויות שלא נענו:"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:350
#, c-format
msgid "but %s is installed"
msgstr "אבל %s מותקנת"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:352
#, c-format
msgid "but %s is to be installed"
msgstr "אבל %s הולכת להיות מותקנת"
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:359
msgid "but it is not installable"
msgstr "אבל היא אינה ניתנת להתקנה"
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:361
msgid "but it is a virtual package"
msgstr "אבל היא חבילה וירטואלית"
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:364
msgid "but it is not installed"
msgstr "אבל היא לא מותקנת"
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:364
msgid "but it is not going to be installed"
msgstr "אבל היא אינה הולכת להיות מותקנת"
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:369
msgid " or"
msgstr "או"
-#: cmdline/apt-get.cc:382
+#: cmdline/apt-get.cc:398
msgid "The following NEW packages will be installed:"
msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
-#: cmdline/apt-get.cc:408
+#: cmdline/apt-get.cc:424
msgid "The following packages will be REMOVED:"
msgstr "החבילות הבאות יוסרו:"
-#: cmdline/apt-get.cc:430
+#: cmdline/apt-get.cc:446
msgid "The following packages have been kept back:"
msgstr "החבילות הבאות מעובות:"
-#: cmdline/apt-get.cc:451
+#: cmdline/apt-get.cc:467
msgid "The following packages will be upgraded:"
msgstr "החבילות הבאות ישודרגו:"
-#: cmdline/apt-get.cc:472
+#: cmdline/apt-get.cc:488
msgid "The following packages will be DOWNGRADED:"
msgstr "החבילות הבאות ישודרגו מטה:"
-#: cmdline/apt-get.cc:492
+#: cmdline/apt-get.cc:508
msgid "The following held packages will be changed:"
msgstr "החבילות המחוזקות הבאות ישונו:"
-#: cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:563
#, c-format
msgid "%s (due to %s) "
msgstr "%s (בגלל %s) "
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:571
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -621,311 +330,348 @@ msgstr ""
"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n"
"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!"
-#: cmdline/apt-get.cc:584
+#: cmdline/apt-get.cc:602
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu משודרגים, %lu מותקנים חדשים, "
-#: cmdline/apt-get.cc:588
+#: cmdline/apt-get.cc:606
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu מותקנות מחדש, "
-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:608
#, c-format
msgid "%lu downgraded, "
msgstr "%lu משודרגות מטה, "
-#: cmdline/apt-get.cc:592
+#: cmdline/apt-get.cc:610
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n"
-#: cmdline/apt-get.cc:596
+#: cmdline/apt-get.cc:614
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n"
-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:635
+#, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Note, selecting '%s' for task '%s'\n"
+
+#: cmdline/apt-get.cc:640
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Note, selecting '%s' for regex '%s'\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Package %s is a virtual package provided by:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installed]"
+
+#: cmdline/apt-get.cc:677
+msgid " [Not candidate version]"
+msgstr " [Not candidate version]"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "You should explicitly select one to install."
+
+#: cmdline/apt-get.cc:682
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "However the following packages replace it:"
+
+#: cmdline/apt-get.cc:712
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Package '%s' has no installation candidate"
+
+#: cmdline/apt-get.cc:725
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr "Virtual packages like '%s' can't be removed\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
+#, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
+#, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:788
+#, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Note, selecting '%s' instead of '%s'\n"
+
+#: cmdline/apt-get.cc:818
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
+
+#: cmdline/apt-get.cc:822
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Skipping %s, it is not installed and only upgrades are requested.\n"
+
+#: cmdline/apt-get.cc:834
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+
+#: cmdline/apt-get.cc:839
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s is already the newest version.\n"
+
+#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "אבל %s הולכת להיות מותקנת"
+
+#: cmdline/apt-get.cc:884
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Selected version '%s' (%s) for '%s'\n"
+
+#: cmdline/apt-get.cc:889
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1025
msgid "Correcting dependencies..."
msgstr "מתקן תלויות..."
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:1028
msgid " failed."
msgstr "כשלון."
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:1031
msgid "Unable to correct dependencies"
msgstr "לא מצליח לתקן תלויות"
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:1034
msgid "Unable to minimize the upgrade set"
msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו"
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:1036
msgid " Done"
msgstr "סיום"
-#: cmdline/apt-get.cc:684
+#: cmdline/apt-get.cc:1040
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:1043
msgid "Unmet dependencies. Try using -f."
msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f."
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:1068
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "החבילות הבאות ישודרגו:"
-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:1072
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Authentication warning overridden.\n"
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:1079
msgid "Install these packages without verification [y/N]? "
-msgstr ""
+msgstr "Install these packages without verification [y/N]? "
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:1081
msgid "Some packages could not be authenticated"
-msgstr ""
+msgstr "Some packages could not be authenticated"
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
msgid "There are problems and -y was used without --force-yes"
msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes"
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:1131
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Internal error, InstallPackages was called with broken packages!"
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:1140
msgid "Packages need to be removed but remove is disabled."
-msgstr ""
+msgstr "Packages need to be removed but remove is disabled."
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1151
msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
-msgid "Unable to lock the download directory"
-msgstr "לא מצליח לנעול את ספרית ההורדה."
+msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
-#: apt-pkg/cachefile.cc:65
-msgid "The list of sources could not be read."
-msgstr "רשימת המקורות לא ניתנת לקריאה."
-
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:1189
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org"
-#: cmdline/apt-get.cc:841
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1196
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "צריך לקבל %sB/%sB מתוך הארכיונים.\n"
-#: cmdline/apt-get.cc:844
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1201
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "צריך לקבל %sB מתוך הארכיונים.\n"
-#: cmdline/apt-get.cc:849
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1208
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n"
-#: cmdline/apt-get.cc:852
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1213
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2592
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "אין לך מספיק מקום פנוי ב-%s."
-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:1241
#, c-format
msgid "You don't have enough free space in %s."
msgstr "אין לך מספיק מקום פנוי ב-%s."
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
+msgstr "Trivial Only specified but this is not a trivial operation."
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:1259
msgid "Yes, do as I say!"
msgstr "כן, עשה כפי שאני אומר!"
-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:1261
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
msgid "Abort."
msgstr "בטל."
-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:1282
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "האם אתה רוצה להמשיך? [Y/n]"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "כשלון בהבאת %s %s\n"
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1372
msgid "Some files failed to download"
msgstr "כשלון בהורדת חלק מהקבצים"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
msgid "Download complete and in download only mode"
msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1379
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1383
msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
+msgstr "--fix-missing and media swapping is not currently supported"
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1388
msgid "Unable to correct missing packages."
-msgstr ""
+msgstr "Unable to correct missing packages."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1389
msgid "Aborting install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1086
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1097
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1115
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1126
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
+msgstr "Aborting install."
-#: cmdline/apt-get.cc:1138
-msgid " [Installed]"
-msgstr ""
-
-#: cmdline/apt-get.cc:1143
-msgid "You should explicitly select one to install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1148
-#, c-format
+#: cmdline/apt-get.cc:1417
msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[1] ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
-#: cmdline/apt-get.cc:1167
-msgid "However the following packages replace it:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1170
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr ""
-
-#: cmdline/apt-get.cc:1190
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1198
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1227
-#, c-format
-msgid "Release '%s' for '%s' was not found"
+#: cmdline/apt-get.cc:1421
+msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: cmdline/apt-get.cc:1229
+#: cmdline/apt-get.cc:1559
#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr ""
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr "Ignore unavailable target release '%s' of package '%s'"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1591
#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr ""
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Picking '%s' as source package instead of '%s'\n"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1629
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1313
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Ignore unavailable version '%s' of package '%s'"
-#: cmdline/apt-get.cc:1342
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1395
+#: cmdline/apt-get.cc:1645
msgid "The update command takes no arguments"
-msgstr ""
-
-#: cmdline/apt-get.cc:1408
-msgid "Unable to lock the list directory"
-msgstr ""
+msgstr "The update command takes no arguments"
-#: cmdline/apt-get.cc:1464
+#: cmdline/apt-get.cc:1711
msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-
-#: cmdline/apt-get.cc:1513
-#, fuzzy
-msgid ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
-
-#: cmdline/apt-get.cc:1515
-#, fuzzy, c-format
-msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
+msgstr "We are not supposed to delete stuff, can't start AutoRemover"
-#: cmdline/apt-get.cc:1516
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1815
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
#.
#. if (Packages == 1)
@@ -937,204 +683,298 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
msgid "The following information may help to resolve the situation:"
-msgstr ""
+msgstr "The following information may help to resolve the situation:"
-#: cmdline/apt-get.cc:1528
+#: cmdline/apt-get.cc:1822
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "שגיאה פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:1547
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1602
-#, c-format
-msgid "Couldn't find task %s"
-msgstr ""
+#: cmdline/apt-get.cc:1829
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"The following package was automatically installed and is no longer required:"
+msgstr[1] ""
+"The following packages were automatically installed and are no longer "
+"required:"
-#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
+#: cmdline/apt-get.cc:1833
#, c-format
-msgid "Couldn't find package %s"
-msgstr ""
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] ""
+"%lu package was automatically installed and is no longer required.\n"
+msgstr[1] ""
+"%lu packages were automatically installed and are no longer required.\n"
-#: cmdline/apt-get.cc:1740
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr ""
+#: cmdline/apt-get.cc:1835
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
-#: cmdline/apt-get.cc:1771
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "אבל %s הולכת להיות מותקנת"
+#: cmdline/apt-get.cc:1854
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1953
msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr ""
+msgstr "You might want to run 'apt-get -f install' to correct these:"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1957
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
-#: cmdline/apt-get.cc:1799
+#: cmdline/apt-get.cc:1972
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1817
+#: cmdline/apt-get.cc:1993
msgid "Broken packages"
-msgstr ""
+msgstr "Broken packages"
-#: cmdline/apt-get.cc:1846
+#: cmdline/apt-get.cc:2019
msgid "The following extra packages will be installed:"
-msgstr ""
+msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:2109
msgid "Suggested packages:"
-msgstr ""
+msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:2110
msgid "Recommended packages:"
+msgstr "Recommended packages:"
+
+#: cmdline/apt-get.cc:2152
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Couldn't find package %s"
+
+#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
+#, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s set to automatically installed.\n"
+
+#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
msgstr ""
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:2183
msgid "Calculating upgrade... "
-msgstr ""
+msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
-msgstr ""
+msgstr "Failed"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:2191
msgid "Done"
-msgstr ""
+msgstr "Done"
-#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
+#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "שגיאה פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:2148
-msgid "Must specify at least one package to fetch source for"
+#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
+msgid "Unable to lock the download directory"
+msgstr "לא מצליח לנעול את ספרית ההורדה."
+
+#: cmdline/apt-get.cc:2386
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2391
+#, c-format
+msgid "Downloading %s %s"
+msgstr "Downloading %s %s"
+
+#: cmdline/apt-get.cc:2451
+msgid "Must specify at least one package to fetch source for"
+msgstr "Must specify at least one package to fetch source for"
+
+#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
#, c-format
msgid "Unable to find a source package for %s"
+msgstr "Unable to find a source package for %s"
+
+#: cmdline/apt-get.cc:2508
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
msgstr ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
-#: cmdline/apt-get.cc:2227
+#: cmdline/apt-get.cc:2513
#, c-format
-msgid "Skipping already downloaded file '%s'\n"
+msgid ""
+"Please use:\n"
+"bzr branch %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2566
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Skipping already downloaded file '%s'\n"
+
+#: cmdline/apt-get.cc:2603
#, c-format
msgid "You don't have enough free space in %s"
-msgstr ""
+msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:2268
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:2612
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr ""
+msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:2271
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr ""
+msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2623
#, c-format
msgid "Fetch source %s\n"
-msgstr ""
+msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2661
msgid "Failed to fetch some archives."
-msgstr ""
+msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2692
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
+msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2348
+#: cmdline/apt-get.cc:2704
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr ""
+msgstr "Unpack command '%s' failed.\n"
-#: cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2705
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2366
+#: cmdline/apt-get.cc:2727
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr ""
+msgstr "Build command '%s' failed.\n"
-#: cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2747
msgid "Child process failed"
-msgstr ""
+msgstr "Child process failed"
-#: cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:2766
msgid "Must specify at least one package to check builddeps for"
+msgstr "Must specify at least one package to check builddeps for"
+
+#: cmdline/apt-get.cc:2791
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr ""
+msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2838
#, c-format
msgid "%s has no build depends.\n"
+msgstr "%s has no build depends.\n"
+
+#: cmdline/apt-get.cc:3008
+#, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
msgstr ""
-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:3026
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
-#: cmdline/apt-get.cc:2554
+#: cmdline/apt-get.cc:3049
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Failed to satisfy %s dependency for %s: Installed package %s is too new"
+
+#: cmdline/apt-get.cc:3088
#, c-format
msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2590
+#: cmdline/apt-get.cc:3094
#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
msgstr ""
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:3117
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr ""
+msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2633
+#: cmdline/apt-get.cc:3133
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
+msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2638
+#: cmdline/apt-get.cc:3138
msgid "Failed to process build dependencies"
-msgstr ""
+msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2670
+#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
+#, c-format
+msgid "Changelog for %s (%s)"
+msgstr "Changelog for %s (%s)"
+
+#: cmdline/apt-get.cc:3366
msgid "Supported modules:"
-msgstr ""
+msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:3407
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1158,6 +998,8 @@ msgid ""
" clean - Erase downloaded archive files\n"
" autoclean - Erase old downloaded archive files\n"
" check - Verify that there are no broken dependencies\n"
+" changelog - Download and display the changelog for the given package\n"
+" download - Download the binary package into the current directory\n"
"\n"
"Options:\n"
" -h This help text.\n"
@@ -1178,1649 +1020,2326 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2879
+#: cmdline/apt-get.cc:3572
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
-#: cmdline/acqprogress.cc:55
+#: cmdline/acqprogress.cc:60
msgid "Hit "
-msgstr ""
+msgstr "Hit "
-#: cmdline/acqprogress.cc:79
+#: cmdline/acqprogress.cc:84
msgid "Get:"
-msgstr ""
+msgstr "Get:"
-#: cmdline/acqprogress.cc:110
+#: cmdline/acqprogress.cc:115
msgid "Ign "
-msgstr ""
+msgstr "Ign "
-#: cmdline/acqprogress.cc:114
+#: cmdline/acqprogress.cc:119
msgid "Err "
-msgstr ""
+msgstr "Err "
-#: cmdline/acqprogress.cc:135
+#: cmdline/acqprogress.cc:140
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "Fetched %sB in %s (%sB/s)\n"
-#: cmdline/acqprogress.cc:225
+#: cmdline/acqprogress.cc:230
#, c-format
msgid " [Working]"
-msgstr ""
+msgstr " [Working]"
-#: cmdline/acqprogress.cc:271
+#: cmdline/acqprogress.cc:286
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr ""
-
-#: cmdline/apt-sortpkgs.cc:150
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -s Use source file sorting\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr ""
-
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
-msgid "Press enter to continue."
-msgstr ""
-
-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr ""
-
-#: dselect/install:101
-msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
-
-#: dselect/install:102
-msgid "will be configured. This may result in duplicate errors"
-msgstr ""
-
-#: dselect/install:103
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-
-#: dselect/install:104
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-
-#: dselect/update:30
-msgid "Merging available information"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
-msgid "Corrupted archive"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar checksum failed, archive corrupted"
-msgstr ""
-
-#: apt-inst/contrib/extracttar.cc:296
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:90
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr ""
-
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr ""
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr ""
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr ""
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr ""
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr ""
-
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr ""
-
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "כשלון בפענוח %s"
-
-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
-#, c-format
-msgid "Failed to close file %s"
-msgstr ""
-
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
-#, c-format
-msgid "The path %s is too long"
-msgstr ""
-
-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr ""
-
-#: apt-inst/extract.cc:134
-#, c-format
-msgid "The directory %s is diverted"
-msgstr ""
-
-#: apt-inst/extract.cc:144
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr ""
-
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-msgid "The diversion path is too long"
-msgstr ""
-
-#: apt-inst/extract.cc:240
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
-
-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
-msgstr ""
-
-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr ""
-
-#: apt-inst/extract.cc:414
+#: cmdline/apt-mark.cc:55
#, c-format
-msgid "Overwrite package match with no version for %s"
+msgid "%s can not be marked as it is not installed.\n"
msgstr ""
-#: apt-inst/extract.cc:431
+#: cmdline/apt-mark.cc:61
#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
+msgid "%s was already set to manually installed.\n"
msgstr ""
-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
-#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: cmdline/apt-mark.cc:63
#, c-format
-msgid "Unable to read %s"
+msgid "%s was already set to automatically installed.\n"
msgstr ""
-#: apt-inst/extract.cc:491
+#: cmdline/apt-mark.cc:228
#, c-format
-msgid "Unable to stat %s"
+msgid "%s was already set on hold.\n"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: cmdline/apt-mark.cc:230
#, c-format
-msgid "Failed to remove %s"
+msgid "%s was already not hold.\n"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
#, c-format
-msgid "Unable to create %s"
-msgstr ""
+msgid "Waited for %s but it wasn't there"
+msgstr "Waited for %s but it wasn't there"
-#: apt-inst/deb/dpkgdb.cc:114
+#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
#, c-format
-msgid "Failed to stat %sinfo"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
+msgid "%s set on hold.\n"
msgstr ""
-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
-#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
-#: apt-pkg/pkgcachegen.cc:961
-msgid "Reading package lists"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:176
+#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
#, c-format
-msgid "Failed to change to the admin dir %sinfo"
+msgid "Canceled hold on %s.\n"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-msgid "Internal error getting a package name"
+#: cmdline/apt-mark.cc:332
+msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-msgid "Reading file listing"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
+#: cmdline/apt-mark.cc:379
msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:262
-msgid "Internal error getting a node"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:305
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:358
-msgid "Internal error adding a diversion"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:379
-msgid "The pkg cache must be initialized first"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:439
-#, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:461
-#, c-format
-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:466
-#, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:50
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:110
-#, c-format
-msgid "Couldn't change to %s"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:140
-msgid "Internal error, could not locate member"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:173
-msgid "Failed to locate a valid control file"
-msgstr ""
-
-#: apt-inst/deb/debfile.cc:258
-msgid "Unparsable control file"
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manually or automatically installed. It can also list marks.\n"
+"\n"
+"Commands:\n"
+" auto - Mark the given packages as automatically installed\n"
+" manual - Mark the given packages as manually installed\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -s No-act. Just prints what would be done.\n"
+" -f read/write auto/manual marking in the given file\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-#: methods/cdrom.cc:200
+#: methods/cdrom.cc:203
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr ""
+msgstr "Unable to read the cdrom database %s"
-#: methods/cdrom.cc:209
+#: methods/cdrom.cc:212
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:222
msgid "Wrong CD-ROM"
-msgstr ""
+msgstr "Wrong CD-ROM"
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
+msgstr "Unable to unmount the CD-ROM in %s, it may still be in use."
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254
#, fuzzy
msgid "Disk not found."
msgstr "(לא נמצא)"
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
msgid "File not found"
-msgstr ""
+msgstr "File not found"
-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
+#: methods/rred.cc:512 methods/rred.cc:521
msgid "Failed to stat"
-msgstr ""
+msgstr "Failed to stat"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
msgid "Failed to set modification time"
-msgstr ""
+msgstr "Failed to set modification time"
-#: methods/file.cc:44
+#: methods/file.cc:47
msgid "Invalid URI, local URIS must not start with //"
-msgstr ""
+msgstr "Invalid URI, local URIS must not start with //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
+#: methods/ftp.cc:173
msgid "Logging in"
-msgstr ""
+msgstr "Logging in"
-#: methods/ftp.cc:174
+#: methods/ftp.cc:179
msgid "Unable to determine the peer name"
-msgstr ""
+msgstr "Unable to determine the peer name"
-#: methods/ftp.cc:179
+#: methods/ftp.cc:184
msgid "Unable to determine the local name"
-msgstr ""
+msgstr "Unable to determine the local name"
-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:215 methods/ftp.cc:243
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr ""
+msgstr "The server refused the connection and said: %s"
-#: methods/ftp.cc:216
+#: methods/ftp.cc:221
#, c-format
msgid "USER failed, server said: %s"
-msgstr ""
+msgstr "USER failed, server said: %s"
-#: methods/ftp.cc:223
+#: methods/ftp.cc:228
#, c-format
msgid "PASS failed, server said: %s"
-msgstr ""
+msgstr "PASS failed, server said: %s"
-#: methods/ftp.cc:243
+#: methods/ftp.cc:248
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
-#: methods/ftp.cc:271
+#: methods/ftp.cc:276
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr ""
+msgstr "Login script command '%s' failed, server said: %s"
-#: methods/ftp.cc:297
+#: methods/ftp.cc:302
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr ""
+msgstr "TYPE failed, server said: %s"
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
msgid "Connection timeout"
-msgstr ""
+msgstr "Connection timeout"
-#: methods/ftp.cc:341
+#: methods/ftp.cc:346
msgid "Server closed the connection"
-msgstr ""
+msgstr "Server closed the connection"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
+#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
msgid "Read error"
-msgstr ""
+msgstr "Read error"
-#: methods/ftp.cc:351 methods/rsh.cc:197
+#: methods/ftp.cc:356 methods/rsh.cc:206
msgid "A response overflowed the buffer."
-msgstr ""
+msgstr "A response overflowed the buffer."
-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:373 methods/ftp.cc:385
msgid "Protocol corruption"
-msgstr ""
+msgstr "Protocol corruption"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
+#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
+#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
msgid "Write error"
-msgstr ""
+msgstr "Write error"
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
msgid "Could not create a socket"
-msgstr ""
+msgstr "Could not create a socket"
-#: methods/ftp.cc:704
+#: methods/ftp.cc:707
msgid "Could not connect data socket, connection timed out"
-msgstr ""
+msgstr "Could not connect data socket, connection timed out"
-#: methods/ftp.cc:710
+#: methods/ftp.cc:713
msgid "Could not connect passive socket."
-msgstr ""
+msgstr "Could not connect passive socket."
-#: methods/ftp.cc:728
+#: methods/ftp.cc:730
msgid "getaddrinfo was unable to get a listening socket"
-msgstr ""
+msgstr "getaddrinfo was unable to get a listening socket"
-#: methods/ftp.cc:742
+#: methods/ftp.cc:744
msgid "Could not bind a socket"
-msgstr ""
+msgstr "Could not bind a socket"
-#: methods/ftp.cc:746
+#: methods/ftp.cc:748
msgid "Could not listen on the socket"
-msgstr ""
+msgstr "Could not listen on the socket"
-#: methods/ftp.cc:753
+#: methods/ftp.cc:755
msgid "Could not determine the socket's name"
-msgstr ""
+msgstr "Could not determine the socket's name"
-#: methods/ftp.cc:785
+#: methods/ftp.cc:787
msgid "Unable to send PORT command"
-msgstr ""
+msgstr "Unable to send PORT command"
-#: methods/ftp.cc:795
+#: methods/ftp.cc:797
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr ""
+msgstr "Unknown address family %u (AF_*)"
-#: methods/ftp.cc:804
+#: methods/ftp.cc:806
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr ""
+msgstr "EPRT failed, server said: %s"
-#: methods/ftp.cc:824
+#: methods/ftp.cc:826
msgid "Data socket connect timed out"
-msgstr ""
+msgstr "Data socket connect timed out"
-#: methods/ftp.cc:831
+#: methods/ftp.cc:833
msgid "Unable to accept connection"
-msgstr ""
+msgstr "Unable to accept connection"
-#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
-msgstr ""
+msgstr "Problem hashing file"
-#: methods/ftp.cc:883
+#: methods/ftp.cc:885
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr ""
+msgstr "Unable to fetch file, server said '%s'"
-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:900 methods/rsh.cc:330
msgid "Data socket timed out"
-msgstr ""
+msgstr "Data socket timed out"
-#: methods/ftp.cc:928
+#: methods/ftp.cc:930
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr ""
+msgstr "Data transfer failed, server said '%s'"
#. Get the files information
-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1007
msgid "Query"
-msgstr ""
+msgstr "Query"
-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1119
msgid "Unable to invoke "
-msgstr ""
+msgstr "Unable to invoke "
-#: methods/connect.cc:70
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
-msgstr ""
+msgstr "Connecting to %s (%s)"
-#: methods/connect.cc:81
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
-msgstr ""
+msgstr "[IP: %s %s]"
-#: methods/connect.cc:90
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
+msgstr "Could not create a socket for %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:96
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr ""
+msgstr "Cannot initiate the connection to %s:%s (%s)."
-#: methods/connect.cc:104
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
+msgstr "Could not connect to %s:%s (%s), connection timed out"
-#: methods/connect.cc:119
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr ""
+msgstr "Could not connect to %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:147 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
-msgstr ""
+msgstr "Connecting to %s"
-#: methods/connect.cc:165 methods/connect.cc:184
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
-msgstr ""
+msgstr "Could not resolve '%s'"
-#: methods/connect.cc:190
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr ""
+msgstr "Temporary failure resolving '%s'"
-#: methods/connect.cc:193
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "Something wicked happened resolving '%s:%s' (%i - %s)"
-#: methods/connect.cc:240
+#: methods/connect.cc:247
#, fuzzy, c-format
-#| msgid "Unable to write to %s"
msgid "Unable to connect to %s:%s:"
msgstr "לא מצליח לכתוב ל-%s"
-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr ""
-
-#: methods/gpgv.cc:107
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "At least one invalid signature was encountered."
-#: methods/gpgv.cc:232
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
-msgstr ""
+#: methods/gpgv.cc:189
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+msgstr "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Unknown error executing gpgv"
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
+#: methods/gzip.cc:65
+msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr ""
-
-#: methods/http.cc:385
+#: methods/http.cc:394
msgid "Waiting for headers"
-msgstr ""
-
-#: methods/http.cc:531
-#, c-format
-msgid "Got a single header line over %u chars"
-msgstr ""
+msgstr "Waiting for headers"
-#: methods/http.cc:539
+#: methods/http.cc:544
msgid "Bad header line"
-msgstr ""
+msgstr "Bad header line"
-#: methods/http.cc:558 methods/http.cc:565
+#: methods/http.cc:569 methods/http.cc:576
msgid "The HTTP server sent an invalid reply header"
-msgstr ""
+msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:594
+#: methods/http.cc:606
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
+msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:609
+#: methods/http.cc:621
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
+msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:611
+#: methods/http.cc:623
msgid "This HTTP server has broken range support"
-msgstr ""
+msgstr "This HTTP server has broken range support"
-#: methods/http.cc:635
+#: methods/http.cc:647
msgid "Unknown date format"
-msgstr ""
+msgstr "Unknown date format"
-#: methods/http.cc:790
+#: methods/http.cc:818
msgid "Select failed"
-msgstr ""
+msgstr "Select failed"
-#: methods/http.cc:795
+#: methods/http.cc:823
msgid "Connection timed out"
-msgstr ""
+msgstr "Connection timed out"
-#: methods/http.cc:818
+#: methods/http.cc:846
msgid "Error writing to output file"
-msgstr ""
+msgstr "Error writing to output file"
-#: methods/http.cc:849
+#: methods/http.cc:877
msgid "Error writing to file"
-msgstr ""
+msgstr "Error writing to file"
-#: methods/http.cc:877
+#: methods/http.cc:905
msgid "Error writing to the file"
-msgstr ""
+msgstr "Error writing to the file"
-#: methods/http.cc:891
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
-msgstr ""
+msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:893
+#: methods/http.cc:921
msgid "Error reading from server"
+msgstr "Error reading from server"
+
+#: methods/http.cc:1194
+msgid "Bad header data"
+msgstr "Bad header data"
+
+#: methods/http.cc:1211 methods/http.cc:1266
+msgid "Connection failed"
+msgstr "Connection failed"
+
+#: methods/http.cc:1358
+msgid "Internal error"
+msgstr "Internal error"
+
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
+#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#, c-format
+msgid "Unable to read %s"
+msgstr "Unable to read %s"
+
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
+#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
+#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
+#: apt-pkg/clean.cc:123
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Unable to change to %s"
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:280
+#, c-format
+msgid "No mirror file '%s' found "
+msgstr "No mirror file '%s' found "
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:287
+#, c-format
+msgid "Can not read mirror file '%s'"
msgstr ""
-#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
-#, fuzzy
-msgid "Failed to truncate file"
+#: methods/mirror.cc:442
+#, c-format
+msgid "[Mirror: %s]"
+msgstr "[Mirror: %s]"
+
+#: methods/rred.cc:491
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+
+#: methods/rred.cc:496
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+
+#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Failed to create IPC pipe to subprocess"
+
+#: methods/rsh.cc:338
+msgid "Connection closed prematurely"
+msgstr "Connection closed prematurely"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "Bad default setting!"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
+msgid "Press enter to continue."
+msgstr "Press enter to continue."
+
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr "Do you want to erase any previously downloaded .deb files?"
+
+#: dselect/install:101
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr "Some errors occurred while unpacking. Packages that were installed"
+
+#: dselect/install:102
+msgid "will be configured. This may result in duplicate errors"
+msgstr "will be configured. This may result in duplicate errors"
+
+#: dselect/install:103
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "or errors caused by missing dependencies. This is OK, only the errors"
+
+#: dselect/install:104
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"above this message are important. Please fix them and run [I]nstall again"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "Merging available information"
+
+#: cmdline/apt-extracttemplates.cc:102
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s הוא לא חבילת DEB תקינה."
+
+#: cmdline/apt-extracttemplates.cc:236
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335
+#, c-format
+msgid "Unable to write to %s"
+msgstr "לא מצליח לכתוב ל-%s"
+
+#: cmdline/apt-extracttemplates.cc:313
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "לא מצליח לקבל את גרסת debconf. האם debconf מותקן?"
+
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
+msgid "Package extension list is too long"
+msgstr "Package extension list is too long"
+
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
+#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
+#, c-format
+msgid "Error processing directory %s"
+msgstr "שגיאה בעיבוד ספריה %s"
+
+#: ftparchive/apt-ftparchive.cc:261
+msgid "Source extension list is too long"
+msgstr "Source extension list is too long"
+
+#: ftparchive/apt-ftparchive.cc:378
+msgid "Error writing header to contents file"
+msgstr "Error writing header to contents file"
+
+#: ftparchive/apt-ftparchive.cc:408
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Error processing contents %s"
+
+#: ftparchive/apt-ftparchive.cc:596
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+
+#: ftparchive/apt-ftparchive.cc:802
+msgid "No selections matched"
+msgstr "אין התאמות"
+
+#: ftparchive/apt-ftparchive.cc:880
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "חלק מהקבצים חסרים בקבוצת קבצי החבילה `%s'"
+
+#: ftparchive/cachedb.cc:47
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "מסד הנתונים אינו תקין, הקובץ הועבר ל-%s.old"
+
+#: ftparchive/cachedb.cc:65
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "מסד הנתונים ישן, מנסה לשדרג ל-%s"
+
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+
+#: ftparchive/cachedb.cc:81
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "לא מצליח לפתוח את קובץ מסד הנתונים %s: %s"
+
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Failed to stat %s"
+
+#: ftparchive/cachedb.cc:249
+msgid "Archive has no control record"
+msgstr "Archive has no control record"
+
+#: ftparchive/cachedb.cc:490
+msgid "Unable to get a cursor"
+msgstr "Unable to get a cursor"
+
+#: ftparchive/writer.cc:80
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: לא מצליח לקרוא את הספריה %s\n"
+
+#: ftparchive/writer.cc:85
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Unable to stat %s\n"
+
+#: ftparchive/writer.cc:141
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:143
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:150
+msgid "E: Errors apply to file "
+msgstr "E: שגיאות תקפות לקובץ"
+
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
+#, c-format
+msgid "Failed to resolve %s"
msgstr "כשלון בפענוח %s"
-#: methods/http.cc:1149
-msgid "Bad header data"
+#: ftparchive/writer.cc:181
+msgid "Tree walking failed"
+msgstr "Tree walking failed"
+
+#: ftparchive/writer.cc:208
+#, c-format
+msgid "Failed to open %s"
+msgstr "כשלון בפתיחת %s"
+
+#: ftparchive/writer.cc:267
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:275
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Failed to readlink %s"
+
+#: ftparchive/writer.cc:279
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Failed to unlink %s"
+
+#: ftparchive/writer.cc:286
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** כשלון בקישור %s ל-%s"
+
+#: ftparchive/writer.cc:296
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " DeLink limit of %sB hit.\n"
+
+#: ftparchive/writer.cc:401
+msgid "Archive had no package field"
+msgstr "Archive had no package field"
+
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %s has no override entry\n"
+
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr "המתחזק של %s הוא %s ולא %s\n"
+
+#: ftparchive/writer.cc:721
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s has no source override entry\n"
+
+#: ftparchive/writer.cc:725
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s has no binary override entry either\n"
+
+#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - כשלון בהקצאת זיכרון"
+
+#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#, c-format
+msgid "Unable to open %s"
+msgstr "לא מצליח לפתוח את %s"
+
+#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#, c-format
+msgid "Malformed override %s line %llu #1"
msgstr ""
-#: methods/http.cc:1166 methods/http.cc:1221
-msgid "Connection failed"
+#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#, c-format
+msgid "Malformed override %s line %llu #2"
msgstr ""
-#: methods/http.cc:1313
-msgid "Internal error"
+#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr ""
+
+#: ftparchive/override.cc:128 ftparchive/override.cc:202
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Failed to read the override file %s"
+
+#: ftparchive/multicompress.cc:70
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "'%s' אלגוריתם דחיה לא ידוע"
+
+#: ftparchive/multicompress.cc:100
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Compressed output %s needs a compression set"
+
+#: ftparchive/multicompress.cc:189
+msgid "Failed to create FILE*"
+msgstr "Failed to create FILE*"
+
+#: ftparchive/multicompress.cc:192
+msgid "Failed to fork"
+msgstr "כשלון בביצוע fork"
+
+#: ftparchive/multicompress.cc:206
+msgid "Compress child"
+msgstr "Compress child"
+
+#: ftparchive/multicompress.cc:229
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "שגיאה פנימית, כלשון ביצירת %s"
+
+#: ftparchive/multicompress.cc:304
+msgid "IO to subprocess/file failed"
+msgstr "IO to subprocess/file failed"
+
+#: ftparchive/multicompress.cc:342
+msgid "Failed to read while computing MD5"
+msgstr "Failed to read while computing MD5"
+
+#: ftparchive/multicompress.cc:358
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problem unlinking %s"
+
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "כשלון בשינוי השם %s ל-%s"
+
+#: cmdline/apt-internal-solver.cc:37
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Unknown package record!"
+
+#: cmdline/apt-sortpkgs.cc:153
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "Failed to create pipes"
+
+#: apt-inst/contrib/extracttar.cc:144
+msgid "Failed to exec gzip "
+msgstr "Failed to exec gzip "
+
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+msgid "Corrupted archive"
+msgstr "Corrupted archive"
+
+#: apt-inst/contrib/extracttar.cc:196
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar checksum failed, archive corrupted"
+
+#: apt-inst/contrib/extracttar.cc:303
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Unknown TAR header type %u, member %s"
+
+#: apt-inst/contrib/arfile.cc:74
+msgid "Invalid archive signature"
+msgstr "Invalid archive signature"
+
+#: apt-inst/contrib/arfile.cc:82
+msgid "Error reading archive member header"
+msgstr "Error reading archive member header"
+
+#: apt-inst/contrib/arfile.cc:94
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr "Invalid archive member header %s"
+
+#: apt-inst/contrib/arfile.cc:106
+msgid "Invalid archive member header"
+msgstr "Invalid archive member header"
-#: apt-pkg/contrib/mmap.cc:76
+#: apt-inst/contrib/arfile.cc:132
+msgid "Archive is too short"
+msgstr "Archive is too short"
+
+#: apt-inst/contrib/arfile.cc:136
+msgid "Failed to read the archive headers"
+msgstr "Failed to read the archive headers"
+
+#: apt-inst/filelist.cc:382
+msgid "DropNode called on still linked node"
+msgstr "DropNode called on still linked node"
+
+#: apt-inst/filelist.cc:414
+msgid "Failed to locate the hash element!"
+msgstr "Failed to locate the hash element!"
+
+#: apt-inst/filelist.cc:461
+msgid "Failed to allocate diversion"
+msgstr "Failed to allocate diversion"
+
+#: apt-inst/filelist.cc:466
+msgid "Internal error in AddDiversion"
+msgstr "Internal error in AddDiversion"
+
+#: apt-inst/filelist.cc:479
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Trying to overwrite a diversion, %s -> %s and %s/%s"
+
+#: apt-inst/filelist.cc:508
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Double add of diversion %s -> %s"
+
+#: apt-inst/filelist.cc:551
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Duplicate conf file %s/%s"
+
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "כשלון בפענוח %s"
+
+#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Failed to close file %s"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "The path %s is too long"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Unpacking %s more than once"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "The directory %s is diverted"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "The package is trying to write to the diversion target %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "The diversion path is too long"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "The directory %s is being replaced by a non-directory"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "Failed to locate node in its hash bucket"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "The path is too long"
+
+#: apt-inst/extract.cc:415
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Overwrite package match with no version for %s"
+
+#: apt-inst/extract.cc:432
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "File %s/%s overwrites the one in the package %s"
+
+#: apt-inst/extract.cc:492
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Unable to stat %s"
+
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "This is not a valid DEB archive, missing '%s' member"
+
+#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
+#: apt-inst/deb/debfile.cc:55
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+
+#: apt-inst/deb/debfile.cc:120
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Internal error, could not locate member %s"
+
+#: apt-inst/deb/debfile.cc:214
+msgid "Unparsable control file"
+msgstr "Unparsable control file"
+
+#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
+msgstr "Can't mmap an empty file"
+
+#: apt-pkg/contrib/mmap.cc:111
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Couldn't duplicate file descriptor %i"
+
+#: apt-pkg/contrib/mmap.cc:119
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:146
+msgid "Unable to close mmap"
+msgstr "Unable to close mmap"
+
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+msgid "Unable to synchronize mmap"
+msgstr "Unable to synchronize mmap"
+
+#: apt-pkg/contrib/mmap.cc:290
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+msgstr "Couldn't make mmap of %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "כשלון בפענוח %s"
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:341
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+#: apt-pkg/contrib/mmap.cc:440
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+
+#: apt-pkg/contrib/mmap.cc:443
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:346
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:353
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:360
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:365
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1040
+#: apt-pkg/contrib/strutl.cc:1166
#, c-format
msgid "Selection %s not found"
-msgstr ""
+msgstr "Selection %s not found"
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:491
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr ""
+msgstr "Unrecognized type abbreviation: '%c'"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:605
#, c-format
msgid "Opening configuration file %s"
-msgstr ""
+msgstr "Opening configuration file %s"
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:773
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
-msgstr ""
+msgstr "Syntax error %s:%u: Block starts with no name."
-#: apt-pkg/contrib/configuration.cc:703
+#: apt-pkg/contrib/configuration.cc:792
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
+msgstr "Syntax error %s:%u: Malformed tag"
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:809
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr ""
+msgstr "Syntax error %s:%u: Extra junk after value"
-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:849
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
+msgstr "Syntax error %s:%u: Directives can only be done at the top level"
-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:856
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr ""
+msgstr "Syntax error %s:%u: Too many nested includes"
-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr ""
+msgstr "Syntax error %s:%u: Included from here"
-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:869
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntax error %s:%u: Unsupported directive '%s'"
+
+#: apt-pkg/contrib/configuration.cc:872
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
+"Syntax error %s:%u: clear directive requires an option tree as argument"
-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:922
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr ""
+msgstr "Syntax error %s:%u: Extra junk at end of file"
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
#, c-format
msgid "%c%s... Error!"
-msgstr ""
+msgstr "%c%s... Error!"
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
#, c-format
msgid "%c%s... Done"
-msgstr ""
+msgstr "%c%s... Done"
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr ""
+msgstr "Command line option '%c' [from %s] is not known."
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
#, c-format
msgid "Command line option %s is not understood"
-msgstr ""
+msgstr "Command line option %s is not understood"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option %s is not boolean"
-msgstr ""
+msgstr "Command line option %s is not boolean"
-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
#, c-format
msgid "Option %s requires an argument."
-msgstr ""
+msgstr "Option %s requires an argument."
-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
+msgstr "Option %s: Configuration item specification must have an =<val>."
-#: apt-pkg/contrib/cmndline.cc:234
+#: apt-pkg/contrib/cmndline.cc:237
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr ""
+msgstr "Option %s requires an integer argument, not '%s'"
-#: apt-pkg/contrib/cmndline.cc:265
+#: apt-pkg/contrib/cmndline.cc:268
#, c-format
msgid "Option '%s' is too long"
-msgstr ""
+msgstr "Option '%s' is too long"
-#: apt-pkg/contrib/cmndline.cc:298
+#: apt-pkg/contrib/cmndline.cc:300
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr ""
+msgstr "Sense %s is not understood, try true or false."
-#: apt-pkg/contrib/cmndline.cc:348
+#: apt-pkg/contrib/cmndline.cc:350
#, c-format
msgid "Invalid operation %s"
-msgstr ""
+msgstr "Invalid operation %s"
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
#, c-format
msgid "Unable to stat the mount point %s"
-msgstr ""
-
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
-#, c-format
-msgid "Unable to change to %s"
-msgstr ""
+msgstr "Unable to stat the mount point %s"
-#: apt-pkg/contrib/cdromutl.cc:195
+#: apt-pkg/contrib/cdromutl.cc:224
msgid "Failed to stat the cdrom"
-msgstr ""
+msgstr "Failed to stat the cdrom"
-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:93
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem closing the gzip file %s"
+
+#: apt-pkg/contrib/fileutl.cc:225
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr ""
+msgstr "Not using locking for read only lock file %s"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:230
#, c-format
msgid "Could not open lock file %s"
-msgstr ""
+msgstr "Could not open lock file %s"
-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:248
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
+msgstr "Not using locking for nfs mounted lock file %s"
-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:252
#, c-format
msgid "Could not get lock %s"
+msgstr "Could not get lock %s"
+
+#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:426
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
-msgid "Waited for %s but it wasn't there"
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:453
#, c-format
-msgid "Sub-process %s received a segmentation fault."
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:840
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Sub-process %s received a segmentation fault."
+
+#: apt-pkg/contrib/fileutl.cc:842
#, c-format
msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "Sub-process %s received signal %u."
-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr ""
+msgstr "Sub-process %s returned an error code (%u)"
-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr ""
+msgstr "Sub-process %s exited unexpectedly"
-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
#, c-format
msgid "Could not open file %s"
-msgstr ""
+msgstr "Could not open file %s"
-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:1046
#, c-format
-msgid "read, still have %lu to read but none left"
-msgstr ""
+msgid "Could not open file descriptor %d"
+msgstr "Could not open file descriptor %d"
+
+#: apt-pkg/contrib/fileutl.cc:1136
+msgid "Failed to create subprocess IPC"
+msgstr "Failed to create subprocess IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1192
+msgid "Failed to exec compressor "
+msgstr "Failed to exec compressor "
-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:1289
#, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "read, still have %llu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:669
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#, c-format
+msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:675
-msgid "Problem unlinking the file"
-msgstr ""
+#: apt-pkg/contrib/fileutl.cc:1716
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problem closing the file %s"
-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:1728
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem renaming the file %s to %s"
+
+#: apt-pkg/contrib/fileutl.cc:1739
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problem unlinking the file %s"
+
+#: apt-pkg/contrib/fileutl.cc:1754
msgid "Problem syncing the file"
-msgstr ""
+msgstr "Problem syncing the file"
-#: apt-pkg/pkgcache.cc:133
+#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
-msgstr ""
+msgstr "Empty package cache"
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:154
msgid "The package cache file is corrupted"
-msgstr ""
+msgstr "The package cache file is corrupted"
-#: apt-pkg/pkgcache.cc:144
+#: apt-pkg/pkgcache.cc:159
msgid "The package cache file is an incompatible version"
+msgstr "The package cache file is an incompatible version"
+
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
msgstr ""
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:167
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr ""
+msgstr "This APT does not support the versioning system '%s'"
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:172
msgid "The package cache was built for a different architecture"
-msgstr ""
+msgstr "The package cache was built for a different architecture"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
-msgstr ""
+msgstr "Depends"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
-msgstr ""
+msgstr "PreDepends"
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
-msgstr ""
+msgstr "Suggests"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
-msgstr ""
+msgstr "Recommends"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
-msgstr ""
+msgstr "Conflicts"
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
-msgstr ""
+msgstr "Replaces"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
-msgstr ""
+msgstr "Obsoletes"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
-msgstr ""
+msgstr "Breaks"
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
-msgstr ""
+msgstr "Enhances"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:318
msgid "important"
-msgstr ""
+msgstr "important"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:318
msgid "required"
-msgstr ""
+msgstr "required"
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
-msgstr ""
+msgstr "standard"
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
-msgstr ""
+msgstr "optional"
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
-msgstr ""
+msgstr "extra"
-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
msgid "Building dependency tree"
-msgstr ""
+msgstr "Building dependency tree"
-#: apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc:133
msgid "Candidate versions"
-msgstr ""
+msgstr "Candidate versions"
-#: apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:162
msgid "Dependency generation"
-msgstr ""
+msgstr "Dependency generation"
-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
msgid "Reading state information"
-msgstr ""
+msgstr "Reading state information"
-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:244
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "כשלון בפתיחת %s"
-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:250
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "כשלון בפענוח %s"
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:129
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr ""
+msgstr "Unable to parse package file %s (1)"
-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:216
#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr ""
+msgstr "Unable to parse package file %s (2)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Malformed line %lu in source list %s ([option] unparseable)"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Malformed line %lu in source list %s ([option] too short)"
+
+#: apt-pkg/sourcelist.cc:110
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Malformed line %lu in source list %s ([%s] is not an assignment)"
+
+#: apt-pkg/sourcelist.cc:116
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Malformed line %lu in source list %s ([%s] has no key)"
-#: apt-pkg/sourcelist.cc:90
+#: apt-pkg/sourcelist.cc:119
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Malformed line %lu in source list %s ([%s] key %s has no value)"
+
+#: apt-pkg/sourcelist.cc:132
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (URI)"
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:134
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (dist)"
-#: apt-pkg/sourcelist.cc:95
+#: apt-pkg/sourcelist.cc:137
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (URI parse)"
-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:143
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (absolute dist)"
-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:150
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
+msgstr "Malformed line %lu in source list %s (dist parse)"
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:248
#, c-format
msgid "Opening %s"
-msgstr ""
+msgstr "Opening %s"
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
-msgstr ""
+msgstr "Line %u too long in source list %s."
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr ""
+msgstr "Malformed line %u in source list %s (type)"
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
+msgstr "Type '%s' is not known on line %u in source list %s"
-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
-#: apt-pkg/packagemanager.cc:440
+#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+msgid "Could not configure '%s'. "
msgstr ""
-#: apt-pkg/packagemanager.cc:478
+#: apt-pkg/packagemanager.cc:545
#, c-format
msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr ""
+msgstr "Index file type '%s' is not supported"
-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:266
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
-#: apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
+msgstr "Unable to correct problems, you have held broken packages."
-#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576
msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
+"Some index files failed to download. They have been ignored, or old ones "
"used instead."
msgstr ""
-#: apt-pkg/acquire.cc:60
+#: apt-pkg/acquire.cc:81
#, c-format
-msgid "Lists directory %spartial is missing."
-msgstr ""
+msgid "List directory %spartial is missing."
+msgstr "List directory %spartial is missing."
-#: apt-pkg/acquire.cc:64
+#: apt-pkg/acquire.cc:85
#, c-format
-msgid "Archive directory %spartial is missing."
-msgstr ""
+msgid "Archives directory %spartial is missing."
+msgstr "Archives directory %spartial is missing."
+
+#: apt-pkg/acquire.cc:93
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Unable to lock directory %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:893
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Retrieving file %li of %li (%s remaining)"
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:895
#, c-format
msgid "Retrieving file %li of %li"
-msgstr ""
+msgstr "Retrieving file %li of %li"
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112
#, c-format
msgid "The method driver %s could not be found."
-msgstr ""
+msgstr "The method driver %s could not be found."
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161
#, c-format
msgid "Method %s did not start correctly"
-msgstr ""
+msgstr "Method %s did not start correctly"
-#: apt-pkg/acquire-worker.cc:413
+#: apt-pkg/acquire-worker.cc:440
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-#: apt-pkg/init.cc:133
+#: apt-pkg/init.cc:151
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr ""
+msgstr "Packaging system '%s' is not supported"
-#: apt-pkg/init.cc:149
+#: apt-pkg/init.cc:167
msgid "Unable to determine a suitable packaging system type"
-msgstr ""
+msgstr "Unable to determine a suitable packaging system type"
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:57
#, c-format
msgid "Unable to stat %s."
-msgstr ""
+msgstr "Unable to stat %s."
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
+msgstr "You must put some 'source' URIs in your sources.list"
-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:87
msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
+msgstr "The package lists or status file could not be parsed or opened."
-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:91
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/cachefile.cc:109
+msgid "The list of sources could not be read."
+msgstr "רשימת המקורות לא ניתנת לקריאה."
+
+#: apt-pkg/policy.cc:75
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:399
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Invalid record in the preferences file %s, no Package header"
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:421
#, c-format
msgid "Did not understand pin type %s"
-msgstr ""
+msgstr "Did not understand pin type %s"
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:429
msgid "No priority (or zero) specified for pin"
-msgstr ""
+msgstr "No priority (or zero) specified for pin"
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:87
msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:117
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:132
-#, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:166
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:191
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:195
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:226
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:230
-#, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr ""
+msgstr "Cache has an incompatible versioning system"
-#: apt-pkg/pkgcachegen.cc:258
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (%s%d)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
+msgstr "Wow, you exceeded the number of package names this APT is capable of."
-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc:254
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
+msgstr "Wow, you exceeded the number of versions this APT is capable of."
-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:257
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "Wow, you exceeded the number of descriptions this APT is capable of."
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:301
-#, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:314
-#, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
+msgstr "Wow, you exceeded the number of dependencies this APT is capable of."
-#: apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
+msgstr "Package %s %s was not found while processing file dependencies"
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:1146
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr ""
+msgstr "Couldn't stat source package list %s"
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338
+#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501
+msgid "Reading package lists"
+msgstr "Reading package lists"
+
+#: apt-pkg/pkgcachegen.cc:1251
msgid "Collecting File Provides"
-msgstr ""
+msgstr "Collecting File Provides"
-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450
msgid "IO Error saving source cache"
-msgstr ""
+msgstr "IO Error saving source cache"
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:139
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr ""
+msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:599
msgid "MD5Sum mismatch"
-msgstr ""
+msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
+#: apt-pkg/acquire-item.cc:2002
msgid "Hash Sum mismatch"
+msgstr "Hash Sum mismatch"
+
+#: apt-pkg/acquire-item.cc:1370
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1386
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1428
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:1466
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1488
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "Conflicting distribution: %s (expected %s but got %s)"
+
+#: apt-pkg/acquire-item.cc:1521
+#, c-format
+msgid ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "GPG error: %s: %s"
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1635
#, 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 ""
+"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:1275
+#: apt-pkg/acquire-item.cc:1694
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1753
#, 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:1403
+#: apt-pkg/acquire-item.cc:1851
msgid "Size mismatch"
-msgstr ""
+msgstr "Size mismatch"
-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "לא מצליח לפתוח את קובץ מסד הנתונים %s: %s"
-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
-msgstr ""
+msgstr "No sections in Release file %s"
-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "No Hash entry in Release file %s"
+
+#: apt-pkg/indexrecords.cc:121
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Invalid 'Valid-Until' entry in Release file %s"
+
+#: apt-pkg/indexrecords.cc:140
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Invalid 'Date' entry in Release file %s"
-#: apt-pkg/vendorlist.cc:66
+#: apt-pkg/vendorlist.cc:78
#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr ""
+msgstr "Vendor block %s contains no fingerprint"
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:576
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
msgid "Identifying.. "
-msgstr ""
+msgstr "Identifying.. "
-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:613
#, c-format
msgid "Stored label: %s\n"
-msgstr ""
+msgstr "Stored label: %s\n"
-#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
msgid "Unmounting CD-ROM...\n"
-msgstr ""
+msgstr "Unmounting CD-ROM...\n"
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:642
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr ""
+msgstr "Using CD-ROM mount point %s\n"
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:660
msgid "Unmounting CD-ROM\n"
-msgstr ""
+msgstr "Unmounting CD-ROM\n"
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:665
msgid "Waiting for disc...\n"
-msgstr ""
+msgstr "Waiting for disc...\n"
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:674
msgid "Mounting CD-ROM...\n"
-msgstr ""
+msgstr "Mounting CD-ROM...\n"
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:693
msgid "Scanning disc for index files..\n"
-msgstr ""
+msgstr "Scanning disc for index files..\n"
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:744
#, c-format
msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
msgstr ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:755
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:782
#, c-format
msgid "Found label '%s'\n"
-msgstr ""
+msgstr "Found label '%s'\n"
-#: apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:811
msgid "That is not a valid name, try again.\n"
-msgstr ""
+msgstr "That is not a valid name, try again.\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:828
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
+"This disc is called: \n"
+"'%s'\n"
-#: apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:830
msgid "Copying package lists..."
-msgstr ""
+msgstr "Copying package lists..."
-#: apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:857
msgid "Writing new source list\n"
-msgstr ""
+msgstr "Writing new source list\n"
-#: apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:865
msgid "Source list entries for this disc are:\n"
-msgstr ""
+msgstr "Source list entries for this disc are:\n"
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
#, c-format
msgid "Wrote %i records.\n"
-msgstr ""
+msgstr "Wrote %i records.\n"
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+msgstr "Wrote %i records with %i missing files.\n"
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+msgstr "Wrote %i records with %i mismatched files\n"
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Can't find authentication record for: %s"
+
+#: apt-pkg/indexcopy.cc:521
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash mismatch for: %s"
+
+#: apt-pkg/indexcopy.cc:665
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
msgstr ""
-#: apt-pkg/indexcopy.cc:530
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:696
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "No keyring installed in %s."
+
+#: apt-pkg/cacheset.cc:403
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Release '%s' for '%s' was not found"
+
+#: apt-pkg/cacheset.cc:406
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Version '%s' for '%s' was not found"
+
+#: apt-pkg/cacheset.cc:517
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Couldn't find task '%s'"
+
+#: apt-pkg/cacheset.cc:523
#, c-format
-msgid "Skipping nonexistent file %s"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Couldn't find any package by regex '%s'"
+
+#: apt-pkg/cacheset.cc:534
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
#, c-format
-msgid "Can't find authentication record for: %s"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
msgstr ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/cacheset.cc:555
#, c-format
-msgid "Hash mismatch for: %s"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr "Can't select newest version from package '%s' as it is purely virtual"
+
+#: apt-pkg/cacheset.cc:563
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr "Can't select candidate version from package %s as it has no candidate"
+
+#: apt-pkg/cacheset.cc:571
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr "Can't select installed version from package %s as it is not installed"
+
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:209
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:279
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:73
#, fuzzy, c-format
msgid "Installing %s"
msgstr "מותקן:"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Configuring %s"
-msgstr ""
+msgstr "Configuring %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removing %s"
-msgstr ""
+msgstr "Removing %s"
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Completely removing %s"
-msgstr ""
+msgstr "Completely removing %s"
+
+#: apt-pkg/deb/dpkgpm.cc:77
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Noting disappearance of %s"
-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:78
#, c-format
msgid "Running post-installation trigger %s"
-msgstr ""
+msgstr "Running post-installation trigger %s"
-#: apt-pkg/deb/dpkgpm.cc:558
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:705
#, c-format
msgid "Directory '%s' missing"
-msgstr ""
+msgstr "Directory '%s' missing"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Could not open file '%s'"
+
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Preparing %s"
-msgstr ""
+msgstr "Preparing %s"
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:946
#, c-format
msgid "Unpacking %s"
-msgstr ""
+msgstr "Unpacking %s"
-#: apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Preparing to configure %s"
-msgstr ""
+msgstr "Preparing to configure %s"
-#: apt-pkg/deb/dpkgpm.cc:662
+#: apt-pkg/deb/dpkgpm.cc:953
#, fuzzy, c-format
msgid "Installed %s"
msgstr "מותקן:"
-#: apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Preparing for removal of %s"
-#: apt-pkg/deb/dpkgpm.cc:669
+#: apt-pkg/deb/dpkgpm.cc:960
#, c-format
msgid "Removed %s"
-msgstr ""
+msgstr "Removed %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Preparing to completely remove %s"
-msgstr ""
+msgstr "Preparing to completely remove %s"
-#: apt-pkg/deb/dpkgpm.cc:675
+#: apt-pkg/deb/dpkgpm.cc:966
#, c-format
msgid "Completely removed %s"
-msgstr ""
+msgstr "Completely removed %s"
-#: apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/deb/dpkgpm.cc:1213
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
+msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-#: apt-pkg/deb/dpkgpm.cc:909
+#: apt-pkg/deb/dpkgpm.cc:1243
msgid "Running dpkg"
+msgstr "Running dpkg"
+
+#: apt-pkg/deb/dpkgpm.cc:1415
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1477
+msgid "No apport report written because MaxReports is reached already"
+msgstr "No apport report written because MaxReports is reached already"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1482
+msgid "dependency problems - leaving unconfigured"
+msgstr "dependency problems - leaving unconfigured"
+
+#: apt-pkg/deb/dpkgpm.cc:1484
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+
+#: apt-pkg/deb/dpkgpm.cc:1490
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"No apport report written because the error message indicates a disk full "
+"error"
+
+#: apt-pkg/deb/dpkgpm.cc:1496
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+
+#: apt-pkg/deb/dpkgpm.cc:1503
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
+"No apport report written because the error message indicates a dpkg I/O error"
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/debsystem.cc:84
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:87
#, fuzzy, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
msgstr "לא מצליח לנעול את ספרית ההורדה."
-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:103
+#, c-format
msgid ""
-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
-msgstr ""
+msgstr "Not locked"
-#: methods/rred.cc:219
-msgid "Could not patch file"
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr ""
+#~ msgid "You must give exactly one pattern"
+#~ msgstr "אתה חייב לתת בדיוק תבנית אחת"
+
+#, fuzzy
+#~ msgid ""
+#~ "The following packages were automatically installed and are no longer "
+#~ "required:"
+#~ msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
+
+#, fuzzy
+#~ msgid ""
+#~ "%lu packages were automatically installed and are no longer required.\n"
+#~ msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
diff --git a/po/hu.po b/po/hu.po
index 9cf645472..20da3d907 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt trunk\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Verziótáblázat:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -628,7 +628,7 @@ msgstr "Megszakítva."
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarja [I/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
@@ -826,7 +826,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Sikertelen"
@@ -1027,11 +1027,11 @@ msgstr "Nem sikerült az építési függőségeket feldolgozni"
msgid "Changelog for %s (%s)"
msgstr "Változási napló ehhez: %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1120,7 +1120,7 @@ msgstr ""
"információkért és opciókért.\n"
" Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1195,8 +1195,7 @@ msgid "%s was already not hold.\n"
msgstr "%s eddig sem volt visszafogva.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Nem található a(z) %s, a várakozás után sem"
@@ -1357,8 +1356,8 @@ msgstr "Időtúllépés a kapcsolatban"
msgid "Server closed the connection"
msgstr "A kiszolgáló lezárta a kapcsolatot"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Olvasási hiba"
@@ -1371,8 +1370,8 @@ msgid "Protocol corruption"
msgstr "Protokollhiba"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Írási hiba"
@@ -1427,7 +1426,7 @@ msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1454,91 +1453,86 @@ msgstr "Lekérdezés"
msgid "Unable to invoke "
msgstr "Nem lehet meghívni "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Csatlakozás: %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Foglalat létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nem lehet kapcsolódni ehhez: %s: %s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Kapcsolódás: %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nem lehet feloldani a következőt: „%s”"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Átmeneti hiba „%s” feloldása közben"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nem lehet csatlakozni ehhez: %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata."
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Legalább egy aláírás érvénytelen."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Nem indítható el a „gpgv” az aláírás ellenőrzéséhez (telepítve van a gpgv?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Ismeretlen gpgv futtatási hiba"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1578,53 +1572,53 @@ msgstr "A HTTP-kiszolgáló tartománytámogatása sérült"
msgid "Unknown date format"
msgstr "Ismeretlen dátumformátum"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "A kiválasztás sikertelen"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:923
+#: methods/http.cc:919
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:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Rossz fejlécadatok"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Belső hiba"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "%s nem olvasható"
@@ -1748,7 +1742,7 @@ msgstr ""
" -c=? Ezt a konfigurációs fájlt olvassa be\n"
" -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Nem lehet írni ebbe: %s"
@@ -1895,8 +1889,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "%s elérése sikertelen"
@@ -1909,87 +1903,87 @@ msgstr "Az archívumnak nincs vezérlő rekordja"
msgid "Unable to get a cursor"
msgstr "Nem sikerült egy mutatóhoz jutni"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "F: %s nem érhető el\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "H: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "F: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "H: Hibás a fájl "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Nem sikerült feloldani ezt: %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Fabejárás nem sikerült"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "%s megnyitása sikertelen"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink nem hajtható végre erre: %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "%s törlése sikertelen"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s linkelése sikertelen ehhez: %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " a DeLink korlátja (%sB) elérve.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Az archívumnak nem volt csomag mezője"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartója %s, nem %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nem rendelkezik forrás-felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nem rendelkezik bináris-felülbíráló bejegyzéssel sem\n"
@@ -2063,7 +2057,7 @@ msgstr "Olvasási hiba az MD5 kiszámításakor"
msgid "Problem unlinking %s"
msgstr "Hiba %s törlésekor"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "„%s” átnevezése sikertelen erre: %s"
@@ -2209,54 +2203,54 @@ msgstr "A(z) %s fájl írása sikertelen"
msgid "Failed to close file %s"
msgstr "A(z) %s fájl bezárása sikertelen"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "A(z) %s útvonal túl hosszú"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "A(z) %s többszöri kicsomagolása"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "A(z) %s könyvtár eltérítve"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Az eltérített útvonal túl hosszú"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Nem sikerült a node helyét megtalálni a hashtárolóban"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Az útvonal túl hosszú"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Csomagtalálat felülírása %s verziója nélkül"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "%s nem érhető el"
@@ -2338,30 +2332,30 @@ msgstr ""
"automatikus emelést."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lin %lió %lip %limp"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lió %lip %limp"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%lip %limp"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%limp"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "%s kiválasztás nem található"
@@ -2433,16 +2427,6 @@ msgstr "%c%s... Hiba!"
msgid "%c%s... Done"
msgstr "%c%s... Kész"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Kész"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2560,69 +2544,63 @@ msgstr "%s alfolyamat szegmentálási hibát okozott."
msgid "Sub-process %s received signal %u."
msgstr "A(z) %s alfolyamat %u számú szignált kapott."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s alfolyamat hibakóddal tért vissza (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s alfolyamat váratlanul kilépett"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Nem lehet megnyitni a(z) %s fájlt"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Nem lehet megnyitni a(z) %d fájlleírót"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Nem sikerült az alfolyamat IPC-t létrehozni"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Nem sikerült elindítani a tömörítőt "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "olvasás, még kellene %llu, de már az összes elfogyott"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "írás, még kiírandó %llu, de ez nem lehetséges"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Hiba a(z) %s fájl bezárásakor"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Hiba a(z) %s fájl törlésekor"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Hiba a fájl szinkronizálásakor"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nincs kulcstartó telepítve ide: %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Üres csomaggyorsítótár"
@@ -2648,59 +2626,59 @@ msgstr "Ez az APT nem támogatja a(z) „%s” verziórendszert"
msgid "The package cache was built for a different architecture"
msgstr "A csomaggyorsítótár egy másik architektúrához készült"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Függ ettől"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Függ ettől (előfüggés)"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Javasolja"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Ajánlja"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Ütközik"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Kicseréli"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Elavulttá teszi"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Töri"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Bővíti"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "fontos"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "szükséges"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "szabványos"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opcionális"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2810,12 +2788,12 @@ msgstr "%s megnyitása"
msgid "Line %u too long in source list %s."
msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
@@ -2857,7 +2835,7 @@ msgid ""
msgstr ""
"A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2865,11 +2843,11 @@ msgstr ""
"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
"csomagok okozhatják."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2921,12 +2899,12 @@ msgstr ""
"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
"Entert."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "A(z) „%s” csomagrendszer nem támogatott"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "A megfelelő csomagrendszertípus nem határozható meg"
@@ -2983,14 +2961,14 @@ msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
@@ -3011,29 +2989,29 @@ msgstr "Az APT által kezelhető csomagleírások száma túllépve."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Az APT által kezelhető függőségek száma túllépve."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása "
"közben"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Csomaglisták olvasása"
# FIXME
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "„Biztosítja” kapcsolatok összegyűjtése"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "IO hiba a forrás-gyorsítótár mentésekor"
@@ -3046,12 +3024,12 @@ msgstr "sikertelen átnevezés, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "A Hash Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3060,16 +3038,16 @@ msgstr ""
"A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list "
"bejegyzés vagy helytelenül formázott fájl)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3078,27 +3056,27 @@ msgstr ""
"A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló "
"frissítései nem kerülnek alkalmazásra."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az "
"előző indexfájl lesz használva. GPG hiba: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hiba: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3107,7 +3085,7 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3116,38 +3094,38 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "A(z) %s Release fájl nem dolgozható fel"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
@@ -3247,22 +3225,22 @@ msgstr "Új forráslista írása\n"
msgid "Source list entries for this disc are:\n"
msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i rekord kiírva.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i rekord kiírva, %i hiányzó fájllal.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i rekord kiírva %i eltérő fájllal\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i rekord kiírva %i hiányzó és %i eltérő fájllal\n"
@@ -3277,6 +3255,17 @@ msgstr "%s hitelesítési rekordja nem található"
msgid "Hash mismatch for: %s"
msgstr "%s ellenőrzőösszege nem megfelelő"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nincs kulcstartó telepítve ide: %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3345,114 +3334,114 @@ msgstr "Felkészülés megoldás fogadására"
msgid "External solver failed without a proper error message"
msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Külső solver végrehajtása"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s telepítése"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s konfigurálása"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s eltávolítása"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s teljes eltávolítása"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "„%s” eltűnése feljegyezve"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "A(z) %s telepítés utáni trigger futtatása"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "A(z) „%s” könyvtár hiányzik"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "A(z) „%s” fájl megnyitása sikertelen"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s kicsomagolása"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s konfigurálásának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s telepítve"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s eltávolításának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s eltávolítva"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s teljes eltávolításának előkészítése"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s teljesen eltávolítva"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nem írható a napló, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "A dpkg futtatása"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "függőségi hibák - a csomag beállítatlan maradt"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3460,7 +3449,7 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba "
"egy korábbi hiba következménye."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3476,7 +3465,15 @@ msgstr ""
"Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási "
"hibát jelez"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
+"lévő hibát jelez"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3511,8 +3508,20 @@ msgstr ""
msgid "Not locked"
msgstr "Nincs zárolva"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Kész"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az "
+#~ "előző indexfájl lesz használva. GPG hiba: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "A nem létező %s fájl kihagyása"
@@ -3650,10 +3659,3 @@ msgstr "Nincs zárolva"
#~ msgid "Error occurred while processing %s (CollectFileProvides)"
#~ msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)"
-
-#~ msgid ""
-#~ "No apport report written because the error message indicates an issue on "
-#~ "the local system"
-#~ msgstr ""
-#~ "Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
-#~ "lévő hibát jelez"
diff --git a/po/it.po b/po/it.po
index e0baac726..73cd5ece5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-06-25 21:54+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Tabella versione:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -643,7 +643,7 @@ msgstr "Interrotto."
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile recuperare %s %s\n"
@@ -842,7 +842,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Non riuscito"
@@ -1045,11 +1045,11 @@ msgstr "Elaborazione delle dipendenze di generazione non riuscita"
msgid "Changelog for %s (%s)"
msgstr "Changelog per %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1139,7 +1139,7 @@ msgstr ""
"apt-get(8), sources.list(5) e apt.conf(5).\n"
" Questo APT ha i poteri della Super Mucca.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1215,8 +1215,7 @@ msgid "%s was already not hold.\n"
msgstr "%s era già non bloccato.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "In attesa di %s ma non era presente"
@@ -1376,8 +1375,8 @@ msgstr "Connessione scaduta"
msgid "Server closed the connection"
msgstr "Il server ha chiuso la connessione"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Errore di lettura"
@@ -1390,8 +1389,8 @@ msgid "Protocol corruption"
msgstr "Protocollo danneggiato"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Errore di scrittura"
@@ -1446,7 +1445,7 @@ msgstr "Connessione al socket dati terminata"
msgid "Unable to accept connection"
msgstr "Impossibile accettare connessioni"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Si è verificato un problema nel creare l'hash del file"
@@ -1473,96 +1472,90 @@ msgstr "Interrogazione"
msgid "Unable to invoke "
msgstr "Impossibile invocare "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Connessione a %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Impossibile iniziare la connessione a %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Impossibile connettersi a %s:%s (%s), connessione terminata"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Impossibile connettersi a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Connessione a %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Impossibile risolvere \"%s\""
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr ""
-"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Impossibile connettersi a %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Errore interno: firma corretta, ma non è possibile determinare l'impronta "
"della chiave."
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "È stata trovata almeno una firma non valida."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Impossibile eseguire \"gpgv\" per verificare la firma (forse gpgv non è "
"installato)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Le seguenti firme non erano valide:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1602,53 +1595,53 @@ msgstr "Questo server HTTP ha un supporto del range non corretto"
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Select non riuscita"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Connessione terminata"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Errore nello scrivere sul file di output"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Errore nello scrivere su file"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Errore nello scrivere sul file"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Errore nel leggere dal server"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Header dati non corretto"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Connessione non riuscita"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Errore interno"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Impossibile leggere %s"
@@ -1776,7 +1769,7 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Impossibile scrivere in %s"
@@ -1922,8 +1915,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Impossibile aprire il file del database %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Impossibile eseguire stat su %s"
@@ -1939,87 +1932,87 @@ msgstr "Impossibile ottenere un cursore"
# (ndt) messo A per Avviso
# Inizio con la maiuscola dopo i : perché mi sa che in molti
# casi molte stringhe sono così
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Impossibile leggere la directory %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Impossibile eseguire stat su %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Gli errori si applicano al file "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Risoluzione di %s non riuscita"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Visita dell'albero non riuscita"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Apertura di %s non riuscita"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Delink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Esecuzione di readlink su %s non riuscita"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Esecuzione di unlink su %s non riuscita"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Collegamento di %s a %s non riuscito"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Raggiunto il limite di DeLink di %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "L'archivio non ha un campo \"package\""
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ha un campo override\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " il responsabile di %s è %s non %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ha un campo source override\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s non ha neppure un campo binario override\n"
@@ -2093,7 +2086,7 @@ msgstr "Lettura durante l'elaborazione MD5 non riuscita"
msgid "Problem unlinking %s"
msgstr "Problema nell'unlink di %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Rinomina di %s in %s non riuscita"
@@ -2237,55 +2230,55 @@ msgstr "Scrittura del file %s non riuscita"
msgid "Failed to close file %s"
msgstr "Chiusura del file %s non riuscita"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Il percorso %s è troppo lungo"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Estrazione di %s eseguita più di una volta"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "La directory %s è deviata"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
"Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Il percorso della deviazione è troppo lungo"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "La directory %s sta per essere sostituita da una non-directory"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Localizzazione del nodo nel suo hash bucket non riuscita"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Il percorso è troppo lungo"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Impossibile eseguire stat su %s"
@@ -2369,30 +2362,30 @@ msgstr ""
"ridimensionamento automatico è stato disabilitato dall'utente."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lig %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Selezione %s non trovata"
@@ -2467,16 +2460,6 @@ msgstr "%c%s... Errore"
msgid "%c%s... Done"
msgstr "%c%s... Fatto"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Fatto"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2596,69 +2579,63 @@ msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
msgid "Sub-process %s received signal %u."
msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Il sottoprocesso %s è uscito inaspettatamente"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Impossibile aprire il file %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Impossibile aprire il descrittore del file %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Creazione di un sottoprocesso IPC non riuscita"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Esecuzione non riuscita del compressore "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "scrittura, ancora %llu da scrivere, ma non è possibile"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Si è verificato un problema nel chiudere il file %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Si è verificato un problema nel rinominare il file %s in %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Si è verificato un problema nel sincronizzare il file"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nessun portachiavi installato in %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache dei pacchetti vuota"
@@ -2685,59 +2662,59 @@ msgid "The package cache was built for a different architecture"
msgstr ""
"Il file della cache dei pacchetti è stato generato per un'altra architettura"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Dipende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Pre-dipende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Consiglia"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Raccomanda"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Va in conflitto"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Sostituisce"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Rende obsoleto"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Rompe"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Migliora"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "richiesto"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opzionale"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2847,12 +2824,12 @@ msgstr "Apertura di %s"
msgid "Line %u too long in source list %s."
msgstr "Riga %u troppo lunga nel file %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "La riga %u nel file %s non è corretta (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
@@ -2897,7 +2874,7 @@ msgstr ""
"Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un "
"archivio."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2905,12 +2882,12 @@ msgstr ""
"Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
"potrebbe essere causato da pacchetti bloccati."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2961,12 +2938,12 @@ msgstr "Il metodo %s non si è avviato correttamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Il sistema di pacchetti \"%s\" non è supportato"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
@@ -3026,14 +3003,14 @@ msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
@@ -3056,29 +3033,29 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "È stato superato il numero di dipendenze che questo APT può gestire."
# (ndt) il primo è il nome del pacchetto, il secondo la versione
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle "
"dipendenze"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Lettura elenco dei pacchetti"
# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Il file fornisce"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Errore di I/O nel salvare la cache sorgente"
@@ -3091,12 +3068,12 @@ msgstr "rename() non riuscita: %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5sum non corrispondente"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Somma hash non corrispondente"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3105,17 +3082,17 @@ msgstr ""
"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
"errata o file danneggiato)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3124,27 +3101,27 @@ msgstr ""
"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
"questo repository non verranno applicati."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Si è verificato un errore nel verificare la firma. Il repository non è "
"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Errore GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3153,7 +3130,7 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3163,7 +3140,7 @@ msgstr ""
"correggere manualmente questo pacchetto."
# (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3171,31 +3148,31 @@ msgstr ""
"I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
"per il pacchetto %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Le dimensioni non corrispondono"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossibile analizzare il file Release %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Nessuna sezione nel file Release %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nessuna voce Hash nel file Release %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Voce \"Date\" nel file Release %s non valida"
@@ -3295,22 +3272,22 @@ msgstr "Scrittura nuovo elenco sorgenti\n"
msgid "Source list entries for this disc are:\n"
msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Scritti %i record.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Scritti %i record con %i file mancanti.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Scritti %i record con %i file senza corrispondenze\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3326,6 +3303,17 @@ msgstr "Impossibile trovare il record di autenticazione per %s"
msgid "Hash mismatch for: %s"
msgstr "Hash non corrispondente per %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Il file %s non inizia con un messaggio di firma in chiaro"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nessun portachiavi installato in %s."
+
# (ndt) dovrebbe essere inteso il file Release
#: apt-pkg/cacheset.cc:403
#, c-format
@@ -3401,117 +3389,117 @@ msgstr "Preparazione alla ricezione della soluzione"
msgid "External solver failed without a proper error message"
msgstr "Il solver esterno è terminato senza un errore di messaggio"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Esecuzione solver esterno"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Rimozione di %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Rimozione completa di %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Notata la sparizione di %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Esecuzione comando di post installazione %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Directory \"%s\" mancante"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Impossibile aprire il file \"%s\""
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Estrazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparazione alla configurazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Pacchetto %s installato"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparazione alla rimozione di %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Pacchetto %s rimosso"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparazione alla rimozione completa di %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Pacchetto %s rimosso completamente"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
"è montato)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Esecuzione di dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "L'operazione è stata interrotta prima di essere completata"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Segnalazione apport non scritta poiché è stato raggiunto il valore massimo "
"di MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3519,7 +3507,7 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica la "
"presenza di un fallimento precedente."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3535,7 +3523,15 @@ msgstr ""
"Segnalazione apport non scritta poiché il messaggio di errore indica un "
"errore di memoria esaurita"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Non è stata scritta alcuna segnalazione di apport poiché il messaggio di "
+"errore indica la presenza di un problema nel sistema locale"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3572,8 +3568,22 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloccato"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Il file %s non inizia con un messaggio di firma in chiaro"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr ""
+#~ "Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - "
+#~ "%s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Fatto"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Si è verificato un errore nel verificare la firma. Il repository non è "
+#~ "aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Saltato il file inesistente %s"
@@ -3653,13 +3663,6 @@ msgstr "Non bloccato"
#~ msgid "Got a single header line over %u chars"
#~ msgstr "Ricevuta una singola riga header su %u caratteri"
-#~ msgid ""
-#~ "No apport report written because the error message indicates an issue on "
-#~ "the local system"
-#~ msgstr ""
-#~ "Non è stata scritta alcuna segnalazione di apport poiché il messaggio di "
-#~ "errore indica la presenza di un problema nel sistema locale"
-
#~ msgid "Malformed override %s line %lu #1"
#~ msgstr "Override non corretto: file %s riga %lu #1"
diff --git a/po/ja.po b/po/ja.po
index 399219f2f..a9c3db129 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-07-01 00:14+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -155,7 +155,7 @@ msgid " Version table:"
msgstr " バージョンテーブル:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -635,7 +635,7 @@ msgstr "中断しました。"
msgid "Do you want to continue [Y/n]? "
msgstr "続行しますか [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
@@ -825,7 +825,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "失敗"
@@ -1027,11 +1027,11 @@ msgstr "ビルド依存関係の処理に失敗しました"
msgid "Changelog for %s (%s)"
msgstr "%s (%s) の変更履歴"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1123,7 +1123,7 @@ msgstr ""
"apt-get(8)、sources.list(5)、apt.conf(5) を参照してください。\n"
" この APT は Super Cow Powers 化されています。\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1198,8 +1198,7 @@ msgid "%s was already not hold.\n"
msgstr "%s はすでに保留されていません。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s を待ちましたが、そこにはありませんでした"
@@ -1356,8 +1355,8 @@ msgstr "接続タイムアウト"
msgid "Server closed the connection"
msgstr "サーバが接続を切断しました"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "読み込みエラー"
@@ -1370,8 +1369,8 @@ msgid "Protocol corruption"
msgstr "プロトコルが壊れています"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "書き込みエラー"
@@ -1425,7 +1424,7 @@ msgstr "データソケット接続タイムアウト"
msgid "Unable to accept connection"
msgstr "接続を accept できません"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "ファイルのハッシュでの問題"
@@ -1452,92 +1451,87 @@ msgstr "問い合わせ"
msgid "Unable to invoke "
msgstr "呼び出せません"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s (%s) へ接続しています"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s (%s) への接続を開始できません。"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "%s:%s (%s) へ接続できませんでした。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "%s へ接続しています"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s' を解決できませんでした"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' が一時的に解決できません"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s へ接続できません:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "少なくとも 1 つの不正な署名が発見されました。"
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"署名を検証するための 'gpgv' の実行ができませんでした (gpgv はインストールされ"
"ていますか?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "gpgv の実行中に未知のエラーが発生"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "以下の署名が無効です:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1575,53 +1569,53 @@ msgstr "HTTP サーバのレンジサポートが壊れています"
msgid "Unknown date format"
msgstr "不明な日付フォーマットです"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "select に失敗しました"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "接続タイムアウト"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "出力ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "サーバからの読み込みに失敗しました"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "不正なヘッダです"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "接続失敗"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "内部エラー"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "%s を読み込むことができません"
@@ -1742,7 +1736,7 @@ msgstr ""
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "%s に書き込めません"
@@ -1889,8 +1883,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "DB ファイル %s を開くことができません: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "%s の状態を取得するのに失敗しました"
@@ -1903,87 +1897,87 @@ msgstr "アーカイブにコントロールレコードがありません"
msgid "Unable to get a cursor"
msgstr "カーソルを取得できません"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告: ディレクトリ %s が読めません\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告: %s の状態を取得できません\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "エラー: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "警告: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "エラー: エラーが適用されるファイルは "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "%s の解決に失敗しました"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "ツリー内での移動に失敗しました"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "%s のオープンに失敗しました"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " リンク %s [%s] を外します\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "%s のリンク読み取りに失敗しました"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "%s のリンク解除に失敗しました"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s を %s にリンクするのに失敗しました"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " リンクを外す制限の %sB に到達しました。\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "アーカイブにパッケージフィールドがありませんでした"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s に override エントリがありません\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %1$s メンテナは %3$s ではなく %2$s です\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s にソース override エントリがありません\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s にバイナリ override エントリがありません\n"
@@ -2057,7 +2051,7 @@ msgstr "MD5 の計算中に読み込みに失敗しました"
msgid "Problem unlinking %s"
msgstr "%s のリンク解除で問題が発生しました"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s を %s に名前変更できませんでした"
@@ -2201,55 +2195,55 @@ msgstr "ファイル %s の書き込みに失敗しました"
msgid "Failed to close file %s"
msgstr "%s のクローズに失敗しました"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "パス %s は長すぎます"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s を複数回展開しています"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "ディレクトリ %s は divert されています"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
"このパッケージは diversion のターゲットの %s/%s に書き込もうとしています"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "diversion パスが長すぎます"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "ハッシュバケツ内でノードを特定するのに失敗しました"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "パスが長すぎます"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "%s に対するバージョンのないパッケージマッチを上書きします"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "%s の状態を取得できません"
@@ -2330,30 +2324,30 @@ msgstr ""
"自動増加がユーザによって無効にされているため、MMap のサイズを増やせません。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li日 %li時間 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%li時間 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "選択された %s が見つかりません"
@@ -2425,16 +2419,6 @@ msgstr "%c%s... エラー!"
msgid "%c%s... Done"
msgstr "%c%s... 完了"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 完了"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2549,69 +2533,63 @@ msgstr "子プロセス %s がセグメンテーション違反を受け取り
msgid "Sub-process %s received signal %u."
msgstr "子プロセス %s がシグナル %u を受け取りました。"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子プロセス %s がエラーコード (%u) を返しました"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子プロセス %s が予期せず終了しました"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "ファイル %s をオープンできませんでした"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "ファイルデスクリプタ %d を開けませんでした"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "子プロセス IPC の生成に失敗しました"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "以下の圧縮ツールの実行に失敗しました: "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "読み込みが %llu 残っているはずですが、何も残っていません"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "あと %llu 書き込む必要がありますが、書き込むことができませんでした"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "ファイル %s のクローズ中に問題が発生しました"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "%s から %s へのファイル名変更中に問題が発生しました"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "ファイル %s の削除中に問題が発生しました"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "ファイルの同期中に問題が発生しました"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s にキーリングがインストールされていません。"
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "空のパッケージキャッシュ"
@@ -2637,59 +2615,59 @@ msgstr "この APT はバージョニングシステム '%s' をサポートし
msgid "The package cache was built for a different architecture"
msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "依存"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "先行依存"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "提案"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "推奨"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "競合"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "置換"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "廃止"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "破壊"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "拡張"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "要求"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "標準"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "任意"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "特別"
@@ -2793,12 +2771,12 @@ msgstr "%s をオープンしています"
msgid "Line %u too long in source list %s."
msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
@@ -2841,7 +2819,7 @@ msgstr ""
"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
"つけることができませんでした。"
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2849,11 +2827,11 @@ msgstr ""
"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
"ジが原因です。"
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2905,12 +2883,12 @@ msgstr ""
"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
"さい。"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "パッケージングシステム '%s' はサポートされていません"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "適切なパッケージシステムタイプを特定できません"
@@ -2971,14 +2949,14 @@ msgstr "キャッシュに非互換なバージョニングシステムがあり
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "%s を処理中にエラーが発生しました (%s%d)"
@@ -2999,26 +2977,26 @@ msgstr "この APT が対応している以上の数の説明が要求されま
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "この APT が対応している以上の数の依存関係が発生しました。"
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "ソースパッケージリスト %s の状態を取得できません"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "パッケージリストを読み込んでいます"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "ファイル提供情報を収集しています"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
@@ -3031,12 +3009,12 @@ msgstr "名前の変更に失敗しました。%s (%s -> %s)"
msgid "MD5Sum mismatch"
msgstr "MD5Sum が適合しません"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "ハッシュサムが適合しません"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3045,16 +3023,16 @@ msgstr ""
"期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った "
"sources.list エントリか、壊れたファイル)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3063,29 +3041,29 @@ msgstr ""
"%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新"
"物は適用されません。"
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
"ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
"ました)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"署名照合中にエラーが発生しました。リポジトリは更新されず、過去のインデックス"
"ファイルが使われます。GPG エラー: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG エラー: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3094,7 +3072,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3103,7 +3081,7 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります。"
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3111,31 +3089,31 @@ msgstr ""
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "サイズが適合しません"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release ファイル %s を解釈することができません"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Release ファイル %s にセクションがありません"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release ファイル %s に Hash エントリがありません"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
@@ -3235,22 +3213,22 @@ msgstr "新しいソースリストを書き込んでいます\n"
msgid "Source list entries for this disc are:\n"
msgstr "このディスクのソースリストのエントリ:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i レコードを書き込みました。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3267,6 +3245,17 @@ msgstr "認証レコードが見つかりません: %s"
msgid "Hash mismatch for: %s"
msgstr "ハッシュサムが適合しません: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "ファイル %s はクリア署名されたメッセージで始まっていません"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s にキーリングがインストールされていません。"
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3335,115 +3324,115 @@ msgstr "解決を受け取る準備"
msgid "External solver failed without a proper error message"
msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "外部ソルバを実行"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s をインストールしています"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s を設定しています"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s を削除しています"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s を完全に削除しています"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "%s の消失を記録しています"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "インストール後トリガ %s を実行しています"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "ディレクトリ '%s' が見つかりません"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "ファイル '%s' をオープンできませんでした"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s を展開しています"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s の設定を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s をインストールしました"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s の削除を準備しています"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s を削除しました"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s を完全に削除する準備をしています"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s を完全に削除しました"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな"
"い?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "dpkg を実行しています"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "操作はそれが完了する前に中断されました"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "MaxReports にすでに達しているため、レポートは書き込まれません"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "依存関係の問題 - 未設定のままにしています"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3451,7 +3440,7 @@ msgstr ""
"エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
"は書き込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3467,7 +3456,15 @@ msgstr ""
"エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
"込まれません。"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"エラーメッセージがローカルシステム上の問題を示しているので、apportの報告には"
+"記載されません"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3503,8 +3500,20 @@ msgstr ""
msgid "Not locked"
msgstr "ロックされていません"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "ファイル %s はクリア署名されたメッセージで始まっていません"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... 完了"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "署名照合中にエラーが発生しました。リポジトリは更新されず、過去のインデック"
+#~ "スファイルが使われます。GPG エラー: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "存在しないファイル %s をスキップしています"
diff --git a/po/km.po b/po/km.po
index bb7bd6ee1..51bec27fb 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_km\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr " តារាង​កំណែ ៖"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -635,7 +635,7 @@ msgstr "បោះបង់ ។"
msgid "Do you want to continue [Y/n]? "
msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
@@ -818,7 +818,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "បាន​បរាជ័យ"
@@ -1000,11 +1000,11 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណ
msgid "Changelog for %s (%s)"
msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1089,7 +1089,7 @@ msgstr ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1160,8 +1160,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
@@ -1298,8 +1297,8 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​"
msgid "Server closed the connection"
msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "ការអាន​មានកំហុស"
@@ -1312,8 +1311,8 @@ msgid "Protocol corruption"
msgstr "ការបង្ខូច​ពិធីការ​"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "ការសរសេរ​មានកំហុស"
@@ -1367,7 +1366,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័
msgid "Unable to accept connection"
msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
@@ -1394,91 +1393,86 @@ msgstr "សំណួរ​"
msgid "Unable to invoke "
msgstr "មិន​អាច​ហៅ​ "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP ៖ %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "មិន​អាច​បង្កើត​រន្ធ​សម្រាប់ %s (f=%u t=%u p=%u) បានឡើយ"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "មិនអាច​ចាប់ផ្ដើម​ការតភ្ជាប់​​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ។"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s:%s (%s) បានឡើយ ។"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "មិន​អាច​ដោះស្រាយ​ '%s' បានឡើយ"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1516,53 +1510,53 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ
msgid "Unknown date format"
msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "ជ្រើស​បាន​បរាជ័យ​"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "កំហុស​ខាង​ក្នុង​"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "មិន​អាច​អាន​ %s បានឡើយ"
@@ -1681,7 +1675,7 @@ msgstr ""
" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "មិន​អាច​សរសេរ​ទៅ %s"
@@ -1828,8 +1822,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "មិន​អាច​បើក​ឯកសារ​ DB បានទេ %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែង %s"
@@ -1842,87 +1836,87 @@ msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រ
msgid "Unable to get a cursor"
msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: មិន​អាច​អាន​ថត %s បាន​ឡើយ\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W ៖ មិន​អាច​ថ្លែង %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "បរាជ័យ​ក្នុង​ការ​ដោះស្រាយ %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "មែក​ធាង បាន​បរាជ័យ"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អាន​តំណ​ %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់ %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត​ %s ទៅ %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
@@ -1996,7 +1990,7 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការអាន​
msgid "Problem unlinking %s"
msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
@@ -2141,54 +2135,54 @@ msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯក
msgid "Failed to close file %s"
msgstr "បរាជ័យ​ក្នុងការ​បិទឯកសារ %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "ផ្លូវ​ %s វែង​ពេក"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "កំពុង​ពន្លា​ %s ច្រើន​ជាង​ម្តង​"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "ថត​ %s ត្រូវបាន​បង្វែរ"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "កញ្ចប់ ​កំពុង​ព្យាយាម​សរសេរ​ទៅកាន់​គោលដៅ​បង្វែរ​ %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "ផ្លូវ​បង្វែរ វែងពេក"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "ថត​ %s ត្រូវ​បាន​ជំនួស​ដោយ​មិនមែន​ជា​ថត​"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "បរាជ័យ​ក្នុងការ​ដាក់ថ្នាំង​នៅក្នុង​ធុង​រាយប៉ាយ​របស់វា"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "ផ្លូវ​វែង​ពេក"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "សរសេរ​ជាន់​លើកញ្ចប់ផ្គួផ្គង​ដោយ​គ្មាន​កំណែ​សម្រាប់ %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​មួយ​ក្នុង​កញ្ចប់ %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
@@ -2267,30 +2261,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
@@ -2360,16 +2354,6 @@ msgstr "%c%s... កំហុស ​!"
msgid "%c%s... Done"
msgstr "%c%s... ធ្វើរួច​"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... ធ្វើរួច​"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2481,69 +2465,63 @@ msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​ក
msgid "Sub-process %s received signal %u."
msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
@@ -2570,59 +2548,59 @@ msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​
msgid "The package cache was built for a different architecture"
msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "អាស្រ័យ​"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "អាស្រ័យជា​មុន"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "ផ្ដល់យោបល់​"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "ផ្តល់​អនុសាសន៍​"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "ប៉ះទង្គិច"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "ជំនួស​"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "លែង​ប្រើ"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "សំខាន់​"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "បាន​ទាមទារ"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "គំរូ"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "ស្រេចចិត្ត"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "បន្ថែម"
@@ -2723,12 +2701,12 @@ msgstr "កំពុង​បើក​ %s"
msgid "Line %u too long in source list %s."
msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
@@ -2767,7 +2745,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។"
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2775,11 +2753,11 @@ msgstr ""
"កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​"
"ដែលបាន​ទុក ។"
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2829,12 +2807,12 @@ msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចា
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ"
@@ -2887,14 +2865,14 @@ msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
@@ -2916,26 +2894,26 @@ msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​ល
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
@@ -2948,54 +2926,54 @@ msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (
msgid "MD5Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3004,7 +2982,7 @@ msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
"(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3012,37 +2990,37 @@ msgid ""
msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។"
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
@@ -3139,22 +3117,22 @@ msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ
msgid "Source list entries for this disc are:\n"
msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "បានសរសេរ %i កំណត់ត្រា ។\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់ ។\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
@@ -3169,6 +3147,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3232,119 +3221,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "បាន​ដំឡើង %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "កំពុង​យក %s ចេញ"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "កំពុងរៀបចំ​ %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "កំពុង​ស្រាយ %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "បាន​ដំឡើង %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "បាន​យក %s ចេញ"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3356,7 +3345,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3386,6 +3381,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... ធ្វើរួច​"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
diff --git a/po/ko.po b/po/ko.po
index a4d0af447..c67210c44 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -151,7 +151,7 @@ msgid " Version table:"
msgstr " 버전 테이블:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -632,7 +632,7 @@ msgstr "중단."
msgid "Do you want to continue [Y/n]? "
msgstr "계속 하시겠습니까 [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는데 실패했습니다 %s\n"
@@ -815,7 +815,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "실패"
@@ -1010,11 +1010,11 @@ msgstr "빌드 의존성을 처리하는데 실패했습니다"
msgid "Changelog for %s (%s)"
msgstr "%s(%s)에 연결하는 중입니다"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1102,7 +1102,7 @@ msgstr ""
"apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
" 이 APT는 Super Cow Powers로 무장했습니다.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1177,8 +1177,7 @@ msgid "%s was already not hold.\n"
msgstr "%s 패키지는 이미 최신 버전입니다.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
@@ -1316,8 +1315,8 @@ msgstr "연결 시간 초과"
msgid "Server closed the connection"
msgstr "서버에서 연결을 닫았습니다"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "읽기 오류"
@@ -1330,8 +1329,8 @@ msgid "Protocol corruption"
msgstr "프로토콜이 틀렸습니다"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "쓰기 오류"
@@ -1385,7 +1384,7 @@ msgstr "데이터 소켓 연결 시간 초과"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
@@ -1412,91 +1411,86 @@ msgstr "질의"
msgid "Unable to invoke "
msgstr "다음을 실행할 수 없습니다: "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s(%s)에 연결하는 중입니다"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "%s:%s에 연결할 수 없습니다 (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "%s에 연결하는 중입니다"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s'의 주소를 알아낼 수 없습니다"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s'의 주소를 알아내는데 임시로 실패했습니다"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s에 연결할 수 없습니다:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "다음 서명이 올바르지 않습니다:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1534,53 +1528,53 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는데 오류가 발생했습니다"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "파일에 쓰는데 오류가 발생했습니다"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는데 오류가 발생했습니다"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "서버에서 읽는데 오류가 발생했습니다"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "내부 오류"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
@@ -1702,7 +1696,7 @@ msgstr ""
" -c=? 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "%s에 쓸 수 없습니다"
@@ -1848,8 +1842,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "DB 파일, %s 파일을 열 수 없습니다: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "%s의 정보를 읽는데 실패했습니다"
@@ -1863,88 +1857,88 @@ msgstr "아카이브에 컨트롤 기록이 없습니다"
msgid "Unable to get a cursor"
msgstr "커서를 가져올 수 없습니다"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "경고: %s의 정보를 읽을 수 없습니다\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "오류: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "경고: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "%s의 경로를 알아내는데 실패했습니다"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "트리에서 이동이 실패했습니다"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "%s 파일을 여는데 실패했습니다"
# FIXME: ??
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " 링크 %s [%s] 없애기\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "%s 파일에 readlink하는데 실패했습니다"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "%s 파일을 지우는데 실패했습니다"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "아카이브에 패키지 필드가 없습니다"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s에는 override 항목이 없습니다\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 관리자가 %s입니다 (%s 아님)\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s에는 source override 항목이 없습니다\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s에는 binary override 항목이 없습니다\n"
@@ -2018,7 +2012,7 @@ msgstr "MD5를 계산하는 동안 읽는데 실패했습니다"
msgid "Problem unlinking %s"
msgstr "%s의 링크를 해제하는데 문제가 있습니다"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
@@ -2164,54 +2158,54 @@ msgstr "%s 파일을 쓰는데 실패했습니다"
msgid "Failed to close file %s"
msgstr "%s 파일을 닫는데 실패했습니다"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "경로 %s이(가) 너무 깁니다"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s을(를) 두 번 이상 풀었습니다"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "%s 디렉터리가 전환되었습니다"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "이 패키지에서 전환된 대상에 쓰려고 합니다 (%s/%s)"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "전환하는 경로가 너무 깁니다"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "해시 버킷에서 노드를 찾는데 실패했습니다"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "경로가 너무 깁니다"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "덮어 쓰는 패키지가 %s 패키지의 어떤 버전과도 맞지 않습니다"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "%s의 정보를 읽을 수 없습니다"
@@ -2290,30 +2284,30 @@ msgstr ""
"mmap 크기를 늘릴 수 없습니다. 자동으로 늘리는 기능을 사용자가 금지했습니다."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li일 %li시간 %li분 %li초"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%li시간 %li분 %li초"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%li분 %li초"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%li초"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "선택한 %s이(가) 없습니다"
@@ -2383,16 +2377,6 @@ msgstr "%c%s... 오류!"
msgid "%c%s... Done"
msgstr "%c%s... 완료"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 완료"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2504,69 +2488,63 @@ msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받
msgid "Sub-process %s received signal %u."
msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "%s 파일을 열 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "%d 파일 디스크립터를 열 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "하위 프로세스 IPC를 만드는데 실패했습니다"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "%s 파일을 닫는데 문제가 있습니다"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "%s 파일을 삭제하는데 문제가 있습니다"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "파일을 동기화하는데 문제가 있습니다"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s에 키 모음을 설치하지 않았습니다."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "패키지 캐시가 비어 있습니다"
@@ -2593,59 +2571,59 @@ msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다"
msgid "The package cache was built for a different architecture"
msgstr "패키지 캐시가 다른 아키텍쳐용입니다."
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "의존"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "미리의존"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "제안"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "추천"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "충돌"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "대체"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "없앰"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "망가뜨림"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "향상"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "중요"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "필수"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "표준"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "옵션"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "별도"
@@ -2746,12 +2724,12 @@ msgstr "%s 파일을 여는 중입니다"
msgid "Line %u too long in source list %s."
msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
@@ -2793,7 +2771,7 @@ msgid ""
msgstr ""
"%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2801,11 +2779,11 @@ msgstr ""
"오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수"
"도 있습니다."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2857,12 +2835,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' 패키지 시스템을 지원하지 않습니다"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "올바른 패키지 시스템 타입을 알아낼 수 없습니다"
@@ -2915,14 +2893,14 @@ msgstr "캐시의 버전 시스템이 호환되지 않습니다"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
@@ -2943,26 +2921,26 @@ msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "패키지 목록을 읽는 중입니다"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "파일에서 제공하는 것을 모으는 중입니다"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
@@ -2975,55 +2953,55 @@ msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "해시 합이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n"
"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 오류: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3032,7 +3010,7 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3041,38 +3019,38 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Release 파일 %s에 섹션이 없습니다"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Release 파일 %s에 Hash 항목이 없습니다"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
@@ -3170,22 +3148,22 @@ msgstr "새 소스 리스트를 쓰는 중입니다\n"
msgid "Source list entries for this disc are:\n"
msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "레코드 %i개를 썼습니다.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
@@ -3200,6 +3178,17 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
msgid "Hash mismatch for: %s"
msgstr "다음의 해시가 다릅니다: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s에 키 모음을 설치하지 않았습니다."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3265,114 +3254,114 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s 설치하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s 설정 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s 패키지를 지우는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s 패키지를 완전히 지우는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "%s 사라짐 발견했습니다"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "설치 후 트리거 %s 실행하는 중입니다"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "디렉터리 '%s' 없습니다."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "'%s' 파일을 열 수 없습니다"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s 준비 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s 푸는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s 패키지를 설정할 준비하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s 설치"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s 패키지를 지울 준비하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s 지움"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s 패키지를 완전히 지웠습니다"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "dpkg 실행하는 중입니다"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다."
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3380,7 +3369,7 @@ msgstr ""
"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
"적인 오류입니다."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3393,7 +3382,13 @@ msgid ""
"error"
msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3426,6 +3421,22 @@ msgstr ""
msgid "Not locked"
msgstr "잠기지 않음"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr ""
+#~ "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... 완료"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n"
+#~ "예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "%s 파일은 없으므로 무시합니다"
diff --git a/po/ku.po b/po/ku.po
index f7f2d0996..69e7c677d 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ku\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " Tabloya guhertoyan:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -590,7 +590,7 @@ msgstr "Betal."
msgid "Do you want to continue [Y/n]? "
msgstr "Dixwazî bidomînî [E/n]?"
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
@@ -765,7 +765,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Bilindkirin tê hesibandin..."
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Serneket"
@@ -945,11 +945,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr "Girêdan bi %s (%s) re pêk tê"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -995,7 +995,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1063,8 +1063,7 @@ msgid "%s was already not hold.\n"
msgstr "%s jixwe guhertoya nûtirîn e.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1199,8 +1198,8 @@ msgstr ""
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Çewiya xwendinê"
@@ -1213,8 +1212,8 @@ msgid "Protocol corruption"
msgstr ""
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Çewtiya nivîsînê"
@@ -1268,7 +1267,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr ""
@@ -1296,91 +1295,86 @@ msgstr "Lêpirsîn"
msgid "Unable to invoke "
msgstr "%s venebû"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Girêdan bi %s (%s) re pêk tê"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Bi %s re tê girêdan"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nikarî '%s' çareser bike"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:209
-#, c-format
-msgid "System error resolving '%s:%s'"
-msgstr ""
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nikare bi %s re girêdan pêk bîne %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Di xebitandina gpgv de çewtiya nenas"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1418,54 +1412,54 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Hilbijartin neserketî"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:850
+#: methods/http.cc:846
#, fuzzy
msgid "Error writing to output file"
msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Girêdan pêk nehatiye"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Çewtiya hundirîn"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Nikare %s bixwîne"
@@ -1572,7 +1566,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Nivîsandin ji bo %s ne pêkane"
@@ -1677,8 +1671,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Danegira %s nehate vekirin: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr ""
@@ -1691,87 +1685,87 @@ msgstr "Tomara kontrola arşîvê tuneye"
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: pelrêça %s nayê xwendin\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "%s ji hev nehate veçirandin"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "%s venebû"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Di arşîvê de qada pakêtê tuneye"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -1845,7 +1839,7 @@ msgstr ""
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr ""
@@ -1984,55 +1978,55 @@ msgstr "Nivîsîna pelê %s biserneket"
msgid "Failed to close file %s"
msgstr "Girtina pelê %s biserneket"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Rêça %s zêde dirêj e"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr ""
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr ""
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
#, fuzzy
msgid "The diversion path is too long"
msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr ""
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr ""
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Rêç zêde dirêj e"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr ""
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, fuzzy, c-format
msgid "Unable to stat %s"
msgstr "Nivîsandin ji bo %s ne pêkane"
@@ -2111,30 +2105,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Hilbijartina %s nehatiye dîtin"
@@ -2204,16 +2198,6 @@ msgstr "%c%s... Çewtî!"
msgid "%c%s... Done"
msgstr "%c%s... Çêbû"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Çêbû"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2325,69 +2309,63 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Nikarî pelê %s veke"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Nikarî pelê %s veke"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Di girtina pelî de pirsgirêkek derket"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Di girtina pelî de pirsgirêkek derket"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Di girtina pelî de pirsgirêkek derket"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr ""
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Sazkirin tê betalkirin."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2413,59 +2391,59 @@ msgstr ""
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Bindest"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "PêşBindest"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Pêşniyaz dike"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Tawsiye dike"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Nakokî"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Dikeve şunve"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Kevin dike"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Dişkîne"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "girîng"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "pêwist"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opsiyonel"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "ekstra"
@@ -2565,12 +2543,12 @@ msgstr "%s tê vekirin"
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
@@ -2606,17 +2584,17 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2664,12 +2642,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2722,14 +2700,14 @@ msgstr ""
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Dema şixulandina naveroka %s çewtî"
@@ -2750,26 +2728,26 @@ msgstr ""
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Lîsteya pakêtan tê xwendin"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr ""
@@ -2782,97 +2760,97 @@ msgstr "nav guherandin biserneket, %s (%s -> %s)"
msgid "MD5Sum mismatch"
msgstr "MD5Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hash Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, 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:1700
+#: apt-pkg/acquire-item.cc:1705
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Mezinahî li hev nayên"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Pakêt nehate dîtin %s"
@@ -2966,22 +2944,22 @@ msgstr ""
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i tomar hatin nivîsîn.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2996,6 +2974,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum li hev nayên"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Sazkirin tê betalkirin."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3059,119 +3048,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "%s hatine sazkirin"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s tê mîhengkirin"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s tê rakirin"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s bi tevahî hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Peldanka '%s' kêm e"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Nikarî pelê %s veke"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s tê derxistin"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Mîhengkirina %s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s hatine sazkirin"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Rakirina %s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Bi tevahî rakirina %s tê amadekirin"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s bi tevahî hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3183,7 +3172,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3212,6 +3207,10 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Çêbû"
+
#~ msgid "Failed to remove %s"
#~ msgstr "Rakirina %s biserneket"
diff --git a/po/lt.po b/po/lt.po
index 22e5fc152..0653dd06c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -157,7 +157,7 @@ msgid " Version table:"
msgstr " Versijų lentelė:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -598,7 +598,7 @@ msgstr "Nutraukti."
msgid "Do you want to continue [Y/n]? "
msgstr "Ar norite tęsti [T/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nepavyko parsiųsti %s %s\n"
@@ -782,7 +782,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Skaičiuojami atnaujinimai... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Nepavyko"
@@ -969,11 +969,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr "Jungiamasi prie %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Palaikomi moduliai:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1019,7 +1019,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1090,8 +1090,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ir taip jau yra naujausias.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
@@ -1225,8 +1224,8 @@ msgstr "Jungiamasi per ilgai"
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Skaitymo klaida"
@@ -1239,8 +1238,8 @@ msgid "Protocol corruption"
msgstr ""
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Rašymo klaida"
@@ -1294,7 +1293,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr ""
@@ -1321,90 +1320,85 @@ msgstr "Užklausti"
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Jungiamasi prie %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nepavyko prisijungti prie %s:%s (%s), prisijungimas per ilgai užtruko"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nepavyko prisijungti prie %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Jungiamasi prie %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nepavyko surasti vardo „%s“"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Laikinas sutrikimas ieškant vardo „%s“"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Laikinas sutrikimas ieškant vardo „%s“"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nepavyko prisijungti prie %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Nežinoma klaida kviečiant gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Šie parašai buvo nevalidūs:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1442,53 +1436,53 @@ msgstr ""
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr ""
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Prisijungimo laiko limitas baigėsi"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Klaida bandant rašyti į failą"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Prisijungti nepavyko"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Vidinė klaida"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Nepavyko perskaityti %s"
@@ -1612,7 +1606,7 @@ msgstr ""
" -c=? Nuskaityti šį konfigūracijų failą\n"
" -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Nepavyko įrašyti į %s"
@@ -1764,8 +1758,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Nepavyko patikrinti %s"
@@ -1778,87 +1772,87 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Į: Nepavyko perskaityti aplanko %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Į: Nepavyko patikrinti %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "K: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "Į: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "K: Klaidos failui "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Nepavyko išspręsti %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Judesys medyje nepavyko"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Nepavyko atverti %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Nepavyko nuskaityti nuorodos %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Nepavyko atsieti nuorodos %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nepavyko susieti %s su %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Archyvas neturėjo paketo lauko"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s neturi perrašymo įrašo\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s prižiūrėtojas yra %s, o ne %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -1932,7 +1926,7 @@ msgstr "Skaitymo klaida skaičiuojant MD5"
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Nepavyko pervadinti %s į %s"
@@ -2079,54 +2073,54 @@ msgstr ""
msgid "Failed to close file %s"
msgstr ""
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Kelias %s per ilgas"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr ""
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr ""
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr ""
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr ""
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr ""
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Kelias per ilgas"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr ""
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr ""
@@ -2205,30 +2199,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2298,16 +2292,6 @@ msgstr "%c%s... Klaida!"
msgid "%c%s... Done"
msgstr "%c%s... Baigta"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Baigta"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2419,69 +2403,63 @@ msgstr "Procesas %s gavo segmentavimo klaidą"
msgid "Sub-process %s received signal %u."
msgstr "Procesas %s gavo segmentavimo klaidą"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Procesas %s grąžino klaidos kodą (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Procesas %s netikėtai išėjo"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Nepavyko atverti failo %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Nepavyko atverti failo %s"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Nepavyko sukurti subproceso IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Nepavyko paleisti suspaudėjo "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Klaida užveriant failą"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Klaida sinchronizuojant failą"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Klaida užveriant failą"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Klaida sinchronizuojant failą"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Diegimas nutraukiamas."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr ""
@@ -2507,59 +2485,59 @@ msgstr ""
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Priklauso"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Priešpriklauso"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Siūlo"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Rekomenduoja"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Konfliktuoja"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Pakeičia"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Pakeičia"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Sugadina"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "Svarbu"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "privaloma"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standartinis"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "nebūtinas"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "papildomas"
@@ -2659,12 +2637,12 @@ msgstr "Atveriama %s"
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
@@ -2700,17 +2678,17 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2761,12 +2739,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Įdėkite diską „%s“ į įrenginį „%s“ ir paspauskite Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2821,14 +2799,14 @@ msgstr ""
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Klaida apdorojant turinį %s"
@@ -2849,26 +2827,26 @@ msgstr ""
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Skaitomi paketų sąrašai"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr ""
@@ -2881,97 +2859,97 @@ msgstr ""
msgid "MD5Sum mismatch"
msgstr "MD5 sumos neatitikimas"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Maišos sumos nesutapimas"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG klaida: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, 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:1700
+#: apt-pkg/acquire-item.cc:1705
#, 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."
msgstr ""
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Neatitinka dydžiai"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nepavyko atverti DB failo %s: %s"
@@ -3065,22 +3043,22 @@ msgstr "Rašomas naujas šaltinių sąrašas\n"
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3095,6 +3073,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Maišos sumos nesutapimas"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Diegimas nutraukiamas."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3158,119 +3147,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Įdiegta %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Konfigūruojamas %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Šalinamas %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Visiškai pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Trūksta aplanko „%s“"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Nepavyko atverti failo %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Ruošiamas %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Išpakuojamas %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Ruošiamasi konfigūruoti %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Įdiegta %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Ruošiamasi %s pašalinimui"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Ruošiamasi visiškai pašalinti %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Visiškai pašalintas %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3282,7 +3271,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3312,6 +3307,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Laikinas sutrikimas ieškant vardo „%s“"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Baigta"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
diff --git a/po/mr.po b/po/mr.po
index 84ff30882..f2910412e 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -154,7 +154,7 @@ msgid " Version table:"
msgstr "आवृत्ती कोष्टक:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -629,7 +629,7 @@ msgstr "व्यत्यय/बंद करा."
msgid "Do you want to continue [Y/n]? "
msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
@@ -818,7 +818,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "असमर्थ"
@@ -1000,11 +1000,11 @@ msgstr "बांधणी-डिपेंडन्सीज क्रिया
msgid "Changelog for %s (%s)"
msgstr "%s (%s) ला जोडत आहे"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1091,7 +1091,7 @@ msgstr ""
" apt.conf(5) पुस्तिका पाने पहा.\n"
" ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1162,8 +1162,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
@@ -1301,8 +1300,8 @@ msgstr "वेळेअभावी संबंध जोडता येत
msgid "Server closed the connection"
msgstr "सर्व्हरने संबंध जोडणी बंद केली"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "त्रुटी वाचा"
@@ -1315,8 +1314,8 @@ msgid "Protocol corruption"
msgstr "प्रोटोकॉल खराब झाले"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "लिहिण्यात त्रुटी"
@@ -1370,7 +1369,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी
msgid "Unable to accept connection"
msgstr "जोडणी स्विकारण्यास असमर्थ"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "फाईल हॅश करण्यात त्रुटी"
@@ -1397,92 +1396,87 @@ msgstr "प्रश्न"
msgid "Unable to invoke "
msgstr "जारी करण्यास करण्यास असमर्थ"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s (%s) ला जोडत आहे"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[आयपी:%s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s (f=%u t=%u p=%u) साठी सॉकेट तयार करू शकत नाही"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "%s:%s (%s). साठी जोडणी इनिशिएट/पुढाकारीत करू शकत नाही"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s (%s) ला जोडू शकत नाही,जोडणी वेळेअभावी तुटली"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "%s:%s (%s) ला जोडू शकत नाही"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "%s ला जोडत आहे"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "%s रिझॉल्व्ह होऊ शकत नाही "
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s ला जोडण्यास असमर्थ:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "किमान एक अवैध सही सापडली."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "खालील सह्या अवैध आहेत:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1520,53 +1514,53 @@ msgstr "HTTP सर्व्हरने विस्तार तांत्
msgid "Unknown date format"
msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "चुकले/असमर्थ निवड करा"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "जोडणी वेळेअभावी तुटली"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "सर्व्हर मधून वाचण्यात चूक"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "चुकीचा शीर्षक डाटा"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "जोडणी अयशस्वी"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "अंतर्गत त्रुटी"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "%s वाचण्यास असमर्थ"
@@ -1686,7 +1680,7 @@ msgstr ""
" -c=? ही संरचना संचिका वाचा \n"
" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "%s मध्ये लिहिण्यास असमर्थ "
@@ -1833,8 +1827,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "%s: %s DB संचिका उघडण्यास असमर्थ"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "%s स्टेट करण्यास असमर्थ"
@@ -1847,87 +1841,87 @@ msgstr "अर्काईव्ह मध्ये नियंत्रण म
msgid "Unable to get a cursor"
msgstr "संकेतक घेण्यास असमर्थ"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "धो.सू.:%s स्टेट करण्यास असमर्थ\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E:"
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "धो.सू.:"
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "%s सोडवण्यास असमर्थ"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "ट्री चालणे असमर्थ"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "%s उघडण्यास असमर्थ"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "%s [%s] डी दुवा\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "%s वाचणारा दुवा असमर्थ"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "%s दुवा काढण्यास असमर्थ"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "%s चा %s दुवा साधण्यास असमर्थ"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "%sB हीट ची डिलींक मर्यादा\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
@@ -2001,7 +1995,7 @@ msgstr "MD5 कामप्युटींग करतांना वाचण
msgid "Problem unlinking %s"
msgstr "%s दुवा मोकळा/सुटा करण्यास अडचण"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
@@ -2147,54 +2141,54 @@ msgstr "%s फाईल मध्ये लिहिण्यास असमर
msgid "Failed to close file %s"
msgstr "%s फाईल बंद करण्यास असमर्थ"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "मार्ग %s हा खूप लांब आहे"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s एकापेक्षा जास्त वेळा उघडत आहे"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "%s संचिका डायव्हर्ट केली आहे/वळवली आहे"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "डायव्हर्जन इच्छित %s/%s मध्ये लिहिण्याचा पॅकेज प्रयत्न करत आहे"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "डायव्हर्जन मार्ग हा खूप लांब आहे"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "%s संचिका ही संचिका नसलेल्या संचिकेबरोबर बदललेली आहे"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "नोडचे त्याच्या हॅश बकेटमध्ये/बादलीत स्थान निश्चित करण्यास असमर्थ"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "मार्ग खूप लांब आहे"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "%s च्या आवृत्तीशी पुनः लिहिलेल्या पॅकेज जुळत नाही"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "File %s/%s, %s पॅकेज मधल्या एका वर पुनर्लिखित होते"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "%s स्टॅट करण्यास असमर्थ"
@@ -2272,30 +2266,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "%s निवडक भाग सापडत नाही"
@@ -2365,16 +2359,6 @@ msgstr "%c%s... चूक/त्रुटी!"
msgid "%c%s... Done"
msgstr "%c%s... झाले"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... झाले"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2486,69 +2470,63 @@ msgstr "%s उपक्रियेला सेगमेंटेशन दो
msgid "Sub-process %s received signal %u."
msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "%s फाईल उघडता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "%s साठी पाईप उघडता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "आयपीसी उपक्रिया तयार करण्यास असमर्थ"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "फाईल बंद करण्यात अडचण"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "संचिकेची syncing समस्या"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "फाईल अनलिंकिंग करण्यात अडचण"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "संचिकेची syncing समस्या"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "संस्थापन खंडित करत आहे."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "पॅकेज अस्थाई स्मृतिकोष"
@@ -2575,59 +2553,59 @@ msgstr "'%s' आवृत्तीकरण प्रणालीला हे A
msgid "The package cache was built for a different architecture"
msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "अवलंबित"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "पूर्व अवलंबित"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "सुचवणे"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "शिफारस"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "परस्परविरोध"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "परत त्याठिकाणी आणा"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "अप्रचलित"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "तोडले"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "अत्यावश्यक"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "आवश्यक"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "मानक"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "एच्छिक"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "अधिक"
@@ -2727,12 +2705,12 @@ msgstr "%s उघडत आहे"
msgid "Line %u too long in source list %s."
msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
@@ -2772,7 +2750,7 @@ msgid ""
msgstr ""
"%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2780,11 +2758,11 @@ msgstr ""
"दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित "
"पॅकेजेस असू शकते."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2835,12 +2813,12 @@ msgstr "%s कार्यपध्दती योग्य रीतीने
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
@@ -2893,14 +2871,14 @@ msgstr "अस्थायी स्मृतिकोष मध्ये वि
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
@@ -2926,26 +2904,26 @@ msgstr ""
"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
"ओलांडली आहे."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "पॅकेज याद्या वाचत आहोत"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
@@ -2958,53 +2936,53 @@ msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s
msgid "MD5Sum mismatch"
msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "हॅश बेरीज जुळत नाही"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3013,7 +2991,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3022,7 +3000,7 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3030,31 +3008,31 @@ msgstr ""
"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
"ठिकाण %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "आकार जुळतनाही"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
@@ -3152,22 +3130,22 @@ msgstr "नविन स्त्रोत सूची लिहित आह
msgid "Source list entries for this disc are:\n"
msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i माहितीसंच लिहिले.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i गहाळ संचिकाबरोबर %i माहिती संच लिहिले.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i विजोड संचिकांबरोबर %i माहिती संच लिहिले\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n"
@@ -3182,6 +3160,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "हॅश बेरीज जुळत नाही"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "संस्थापन खंडित करत आहे."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3245,119 +3234,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s संस्थापित होत आहे"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s संरचित होत आहे"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s काढून टाकत आहे"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s संपूर्ण काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "'%s' संचयिका गहाळ आहे"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "%s फाईल उघडता येत नाही"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s तयार करित आहे"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s सुटे/मोकळे करीत आहे "
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "%s संरचने साठी तयार करत आहे"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s संस्थापित झाले"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s संपूर्ण काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "सत्रनोंद लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3369,7 +3358,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3399,6 +3394,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... झाले"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "%s संरचना फाईल उघडत आहे"
diff --git a/po/nb.po b/po/nb.po
index d97d38d76..d5c2bb0f4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -640,7 +640,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke å skaffe %s %s\n"
@@ -831,7 +831,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Mislyktes"
@@ -1020,11 +1020,11 @@ msgstr "Klarte ikke å behandle forutsetningene for bygging"
msgid "Changelog for %s (%s)"
msgstr "Kobler til %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Støttede moduler:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1113,7 +1113,7 @@ msgstr ""
"for mer informasjon og flere valg.\n"
" Denne APT har kraften til en Superku.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1188,8 +1188,7 @@ msgid "%s was already not hold.\n"
msgstr "%s er allerede nyeste versjon.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventet på %s, men den ble ikke funnet"
@@ -1329,8 +1328,8 @@ msgstr "Tidsavbrudd på forbindelsen"
msgid "Server closed the connection"
msgstr "Tjeneren lukket forbindelsen"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Lesefeil"
@@ -1343,8 +1342,8 @@ msgid "Protocol corruption"
msgstr "Protokollødeleggelse"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Skrivefeil"
@@ -1398,7 +1397,7 @@ msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke å godta tilkoblingen"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nøkkel for fil"
@@ -1425,91 +1424,86 @@ msgstr "Spørring"
msgid "Unable to invoke "
msgstr "Klarte ikke å starte"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Kobler til %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Klarte ikke å opprette en sokkel for %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Klarte ikke å koble til %s:%s (%s), tidsavbrudd på forbindelsen"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Klarte ikke å koble til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Kobler til %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Klarte ikke å slå opp «%s»"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Midlertidig feil ved oppslag av «%s»"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikke koble til %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Minst en ugyldig signatur ble funnet."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Ukjent feil ved kjøring av gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "De følgende signaturene var ugyldige:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1549,53 +1543,53 @@ msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Tidsavbrudd på forbindelsen"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Ødelagte hodedata"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Intern feil"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Klarer ikke å lese %s"
@@ -1720,7 +1714,7 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Kan ikke skrive til %s"
@@ -1867,8 +1861,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Klarte ikke å åpne Databasefila %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Klarte ikke å få statusen på %s"
@@ -1881,87 +1875,87 @@ msgstr "Arkivet har ingen kontrollpost"
msgid "Unable to get a cursor"
msgstr "Klarte ikke å finne en peker"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Klarte ikke å lese katalogen %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Klarte ikke å få statusen på %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "F:"
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A:"
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila"
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikke å slå opp %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Klarte ikke å finne fram i treet"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikke å åpne %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikke å lese lenken %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikke å oppheve lenken %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikke å lenke %s til %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa på %s B er nådd.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Arkivet har ikke noe pakkefelt"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen overstyringsoppføring\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikeholderen er %s, ikke %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen kildeoverstyringsoppføring\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har ingen binæroverstyringsoppføring heller\n"
@@ -2035,7 +2029,7 @@ msgstr "Klarte ikke å lese under utregning av MD5"
msgid "Problem unlinking %s"
msgstr "Problem ved oppheving av lenken til %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Klarte ikke å endre navnet på %s til %s"
@@ -2181,54 +2175,54 @@ msgstr "Klarte ikke å skrive fila %s"
msgid "Failed to close file %s"
msgstr "Klarte ikke å lukke fila %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Stien %s er for lang"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Pakker ut %s mer enn en gang"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Katalogen %s er avledet"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Pakken prøver å skrive til avledningsmålet %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Avledningsstien er for lang"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Fant ikke knutepunktet i dens hash-spann"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Stien er for lang"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Skriver over pakketreff uten versjon for %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Klarte ikke å få statusen på %s"
@@ -2312,30 +2306,30 @@ msgstr ""
"av brukeren."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lit %lim %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lit %lim %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%lim %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Fant ikke utvalget %s"
@@ -2405,16 +2399,6 @@ msgstr "%c%s ... Feil"
msgid "%c%s... Done"
msgstr "%c%s ... Ferdig"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s ... Ferdig"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2526,69 +2510,63 @@ msgstr "Underprosessen %s mottok et minnefeilsignal."
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok signalet %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s ga en feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avsluttet uventet"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Klarte ikke åpne fila %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Klarte ikke åpne fildeskriptor %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Klarte ikke å opprette underprosessen IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Klarte ikke å kjøre komprimeringen"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem ved låsing av fila %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem ved endring av navn på fila %s til %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem ved oppheving av lenke til fila %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problem ved oppdatering av fila"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nøkkelring installert i %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Tomt pakkelager"
@@ -2615,59 +2593,59 @@ msgstr "Denne APT støtter ikke versjonssystemet «%s»"
msgid "The package cache was built for a different architecture"
msgstr "Pakkelageret ble bygd for en annen arkitektur"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Avhenger av"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Forutsetter"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Foreslår"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Anbefaler"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Er i konflikt med"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Erstatter"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Nuller"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Ødelegger"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Forbedrer"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "viktig"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "påkrevet"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "vanlig"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "valgfri"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "tillegg"
@@ -2767,12 +2745,12 @@ msgstr "Åpner %s"
msgid "Line %u too long in source list %s."
msgstr "Linje %u i kildelista %s er for lang"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Feil på %u i kildelista %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
@@ -2814,7 +2792,7 @@ msgid ""
msgstr ""
"Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2822,11 +2800,11 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
"som holdes tilbake."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2877,12 +2855,12 @@ msgstr "Metoden %s startet ikke korrekt"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet «%s» støttes ikke"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarer ikke bestemme en passende pakkesystemtype"
@@ -2937,14 +2915,14 @@ msgstr "Lageret har et uoverensstemmende versjonssystem"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Feil oppsto under behandling av %s (FindPkg)"
@@ -2965,26 +2943,26 @@ msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Leser pakkelister"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Samler inn filtilbud"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "IO-feil ved lagring av kildekode-lager"
@@ -2997,56 +2975,56 @@ msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hashsummen stemmer ikke"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den "
"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-feil: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3055,7 +3033,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:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3064,37 +3042,37 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
"pakken selv."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, 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:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Feil størrelse"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Ingen avsnitt i Release-fila %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ingen sjekksumoppføring i Release-fila %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
@@ -3194,22 +3172,22 @@ msgstr "Skriver ny kildeliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Kildelisteoppføringer for denne CD-en er:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i manglende filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i feile filer.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
@@ -3224,6 +3202,17 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
msgid "Hash mismatch for: %s"
msgstr "Hashsummen stemmer ikke for: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nøkkelring installert i %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3294,113 +3283,113 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installerer %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Setter opp %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Fjerner %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Fjerner %s fullstendig"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Legger merke til at %s forsvinner"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Kjører etter-installasjonsutløser %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Mappa «%s» mangler"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Klarte ikke åpne fila «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Forbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Pakker ut %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Forbereder oppsett av %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Installerte %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Forbereder fjerning av %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Fjernet %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Forbereder å fullstendig slette %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Fjernet %s fullstendig"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Kjører dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "avhengighetsproblemer - lar den være uoppsatt"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3408,7 +3397,7 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
"følgefeil fra en tidligere feil."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3424,7 +3413,13 @@ msgstr ""
"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
"minne»-feil"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3455,6 +3450,21 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
msgid "Not locked"
msgstr "Ikke låst"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s ... Ferdig"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og "
+#~ "den forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Hopper over den ikke-eksisterende fila %s"
diff --git a/po/ne.po b/po/ne.po
index 4d089bf20..1b10232fa 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -157,7 +157,7 @@ msgid " Version table:"
msgstr " संस्करण तालिका:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -633,7 +633,7 @@ msgstr "परित्याग गर्नुहोस् ।"
msgid "Do you want to continue [Y/n]? "
msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तान्न असफल भयो\n"
@@ -818,7 +818,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "स्तर वृद्धि गणना गरिदैछ..."
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "असफल भयो"
@@ -1000,11 +1000,11 @@ msgstr "निर्माण निर्भरताहरू प्रक्
msgid "Changelog for %s (%s)"
msgstr "%s (%s) मा जडान गरिदैछ"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "समर्थित मोड्युलहरू:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1089,7 +1089,7 @@ msgstr ""
"pages हेर्नुहोस् ।\n"
" APT संग सुपर काउ शक्तिहरू छ ।\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1160,8 +1160,7 @@ msgid "%s was already not hold.\n"
msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
@@ -1299,8 +1298,8 @@ msgstr "जडान समय सकियो"
msgid "Server closed the connection"
msgstr "सर्भरले जडान बन्द गर्यो"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "त्रुटि पढ्नुहोस्"
@@ -1313,8 +1312,8 @@ msgid "Protocol corruption"
msgstr "प्रोटोकल दूषित"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "त्रुटि लेख्नुहोस्"
@@ -1368,7 +1367,7 @@ msgstr "डेटा सकेटको जडान समय सकियो"
msgid "Unable to accept connection"
msgstr "जडान स्वीकार गर्न असक्षम भयो"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "समस्या द्रुतान्वेषण फाइल"
@@ -1395,91 +1394,86 @@ msgstr "क्वेरी"
msgid "Unable to invoke "
msgstr "आह्वान गर्न असक्षम भयो"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "%s (%s) मा जडान गरिदैछ"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "%s (f=%u t=%u p=%u) को लागि सकेट सिर्जना गर्न सकिएन"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr " %s:%s (%s) मा जडान सुरुवात गर्न सकेन"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडान समय सकियो"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "%s मा जडान गरिदैछ"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "'%s' हल गर्न सकिएन"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "'%s' हल गर्दा अस्थायी असफल"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "%s %s मा जडान गर्न असफल भयो:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1517,53 +1511,53 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा
msgid "Unknown date format"
msgstr "अज्ञात मिति ढाँचा"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "असफल चयन गर्नुहोस्"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "जडान समय सकियो"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "सर्भरबाट त्रुटि पढिदैछ"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "खराब हेडर डेटा"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "जडान असफल भयो"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "आन्तरिक त्रुटि"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "%s पढ्न असफल भयो"
@@ -1684,7 +1678,7 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr " %s मा लेख्न असक्षम"
@@ -1830,8 +1824,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "DB फाइल %s असक्षम भयो: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr " %s स्थिर गर्न असफल"
@@ -1844,87 +1838,87 @@ msgstr "संग्रह संग नियन्त्रण रेकर्
msgid "Unable to get a cursor"
msgstr "कर्सर प्राप्त गर्न असक्षम भयो"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: डाइरेक्ट्री %s पढ्न असक्षम\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s स्थिर गर्न असक्षम\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "%s हल गर्न असफल भयो"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "ट्री हिडाईँ असफल भयो"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "%s खोल्न असफल"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "लिङ्क पढ्न असफल %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "अनलिङ्क गर्न असफल %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** %s मा %s लिङ्क असफल भयो"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s संभारकर्ता %s हो %s होइन\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
@@ -1998,7 +1992,7 @@ msgstr "MD5 गणना गर्दा पढ्न असफल भयो"
msgid "Problem unlinking %s"
msgstr "समस्या अनलिङ्क भइरहेछ %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr " %s मा %s पुन:नामकरण असफल भयो"
@@ -2143,54 +2137,54 @@ msgstr "फाइल %s लेख्न असफल भयो"
msgid "Failed to close file %s"
msgstr "%s फाइल बन्द गर्न असफल भयो"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "बाटो %s अति लामो छ "
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "एक भन्दा बढी %s अनप्याक गरिदैछ"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "डाइरेक्ट्री %s फेरियो "
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "प्याकेज लक्षित मोडमा लेख्ने प्यास गर्दैछ %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "घुम्ती बाटो अति लामो छ"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "डाइरेक्ट्री %s डाइरेक्ट्री विहिन द्वारा बदलिदैछ"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "यसको ह्यास बाल्टीमा नोड स्थित गर्न असफल भयो"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "बाटो अति लामो छ"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा अधिलेखन गर्दछ"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "%s स्थिर गर्न असक्षम भयो"
@@ -2269,30 +2263,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "चयन %s फेला पार्न सकिएन"
@@ -2362,16 +2356,6 @@ msgstr "%c%s... त्रुटि!"
msgid "%c%s... Done"
msgstr "%c%s... गरियो"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... गरियो"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2483,69 +2467,63 @@ msgstr "सहायक प्रक्रिया %s ले खण्डिक
msgid "Sub-process %s received signal %u."
msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "फाइल %s खोल्न सकिएन"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "%s को लागि पाइप खोल्न सकिएन"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "सहायक प्रक्रिया IPC सिर्जना गर्न असफल"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "फाइल बन्द गर्दा समस्या"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "फाइल गुप्तिकरण गर्दा समस्या"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "फाइल अनलिङ्क गर्दा समस्या"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "फाइल गुप्तिकरण गर्दा समस्या"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "स्थापना परित्याग गरिदैछ ।"
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "खाली प्याकेज क्यास"
@@ -2572,59 +2550,59 @@ msgstr "यो APT ले संस्करण प्रणालीलाई
msgid "The package cache was built for a different architecture"
msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "आधारित"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "पुन:आधारित"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "सुझाव दिन्छ"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "सिफारिस गर्दछ"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "द्वन्दहरू"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "बदल्छ"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "वेकायमहरू"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "महत्वपूर्ण"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "आवश्यक"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "मानक"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "वैकल्पिक"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "अतिरिक्त"
@@ -2725,12 +2703,12 @@ msgstr "%s खोलिदैछ"
msgid "Line %u too long in source list %s."
msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
@@ -2769,7 +2747,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।"
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2777,11 +2755,11 @@ msgstr ""
"त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको "
"कारणले गर्दा हो ।"
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2832,12 +2810,12 @@ msgstr "विधि %s सही रुपले सुरू हुन सक
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो"
@@ -2890,14 +2868,14 @@ msgstr "क्यास संग एउटा नमिल्दो संस
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
@@ -2919,26 +2897,26 @@ msgstr "वाऊ, APT ले सक्षम गरेको संस्कर
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "प्याकेज सूचिहरू पढिदैछ"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
@@ -2951,54 +2929,54 @@ msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s)
msgid "MD5Sum mismatch"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3007,7 +2985,7 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3016,37 +2994,37 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् ।"
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "साइज मेल खाएन"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
@@ -3143,22 +3121,22 @@ msgstr "नयाँ स्रोत सूचि लेखिदैछ\n"
msgid "Source list entries for this disc are:\n"
msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i रेकर्डहरू लेखियो ।\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "हराइरहेको फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n"
@@ -3173,6 +3151,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum मेल भएन"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "स्थापना परित्याग गरिदैछ ।"
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3236,119 +3225,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr " %s स्थापना भयो"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr " %s कनफिगर गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr " %s हटाइदैछ"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr " %s पूर्ण रुपले हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "फाइल %s खोल्न सकिएन"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr " %s तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr " %s अनप्याक गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr " %s कनफिगर गर्न तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr " %s स्थापना भयो"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr " %s हटाउन तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr " %s हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr " %s पूर्ण रुपले हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3360,7 +3349,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3390,6 +3385,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... गरियो"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
diff --git a/po/nl.po b/po/nl.po
index c3bec13e5..25d4af965 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15.9\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2011-12-05 17:10+0100\n"
"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -157,7 +157,7 @@ msgid " Version table:"
msgstr " Versietabel:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -642,7 +642,7 @@ msgstr "Afbreken."
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s is mislukt %s\n"
@@ -836,7 +836,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Mislukt"
@@ -860,7 +860,7 @@ msgstr ""
#: cmdline/apt-get.cc:2393
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "%s %s downloaden"
#: cmdline/apt-get.cc:2453
msgid "Must specify at least one package to fetch source for"
@@ -1037,11 +1037,11 @@ msgstr "Verwerken van de bouwvereisten is mislukt"
msgid "Changelog for %s (%s)"
msgstr "Er wordt verbinding gemaakt met %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1130,7 +1130,7 @@ msgstr ""
"voor meer informatie en opties.\n"
" Deze APT heeft Super Koe kracht.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1205,8 +1205,7 @@ msgid "%s was already not hold.\n"
msgstr "%s is reeds de nieuwste versie.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
@@ -1345,8 +1344,8 @@ msgstr "Verbinding is verlopen"
msgid "Server closed the connection"
msgstr "Verbinding is verbroken door de server"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Leesfout"
@@ -1359,8 +1358,8 @@ msgid "Protocol corruption"
msgstr "Protocolcorruptie"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Schrijffout"
@@ -1414,7 +1413,7 @@ msgstr "Datasocket verbinding is verlopen"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -1441,94 +1440,89 @@ msgstr "Zoekopdracht"
msgid "Unable to invoke "
msgstr "Aanroepen mislukt van "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Er wordt verbinding gemaakt met %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kon niet verbinden met %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Er wordt verbinding gemaakt met %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kon '%s' niet vinden"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tijdelijke fout bij het opzoeken van '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Kan geen verbinding maken met %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n"
"niet bepalen?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Er is tenminste één ongeldige ondertekening gevonden."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv "
"geïnstalleerd?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Onbekende fout bij het uitvoeren van gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "De volgende ondertekeningen waren ongeldig:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1570,54 +1564,54 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:923
+#: methods/http.cc:919
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:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Interne fout"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Kan %s niet lezen"
@@ -1746,7 +1740,7 @@ msgstr ""
" -c=? Lees dit configuratiebestand.\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Kan niet naar %s schrijven"
@@ -1895,8 +1889,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Kan het DB-bestand %s niet openen: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "stat op %s is mislukt"
@@ -1909,87 +1903,87 @@ msgstr "Archief heeft geen 'control'-record"
msgid "Unable to get a cursor"
msgstr "Kan geen cursor verkrijgen"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Kon map %s niet lezen\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Kon de status van %s niet opvragen\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "F: Er zijn fouten van toepassing op het bestand "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Oplossen van %s is mislukt"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Doorlopen boomstructuur is mislukt"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Openen van %s is mislukt"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " OntlLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink op %s is mislukt"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Ontlinken van %s is mislukt"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Linken van %s aan %s is mislukt"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Ontlinklimiet van %sB bereikt.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Archief heeft geen 'package'-veld"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s heeft geen voorrangsingang\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s beheerder is %s, niet %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
@@ -2063,7 +2057,7 @@ msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
msgid "Problem unlinking %s"
msgstr "Probleem bij het ontlinken van %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Hernoemen van %s naar %s is mislukt"
@@ -2209,54 +2203,54 @@ msgstr "Wegschrijven van bestand %s is mislukt"
msgid "Failed to close file %s"
msgstr "Sluiten van bestand %s is mislukt"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Het pad %s is te lang"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s wordt meer dan eens uitgepakt"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "De map %s is al omgeleid"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Het pakket probeert om het omleidingsdoel %s/%s weg te schrijven"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Het omleidingspad is te lang"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "De map %s wordt vervangen door een niet-map"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Vinden van de knoop in de hash-emmer is mislukt"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Het pad is te lang"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Kan de status van %s niet opvragen"
@@ -2339,30 +2333,30 @@ msgstr ""
"door de gebruiker is uitgeschakeld."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %liu %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%liu %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Selectie %s niet gevonden"
@@ -2435,16 +2429,6 @@ msgstr "%c%s... Fout!"
msgid "%c%s... Done"
msgstr "%c%s... Klaar"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Klaar"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2561,69 +2545,63 @@ msgstr "Subproces %s ontving een segmentatiefout."
msgid "Sub-process %s received signal %u."
msgstr "Subproces %s ontving signaal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subproces %s gaf de foutcode %u terug"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subproces %s sloot onverwacht af"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Kon het bestand %s niet openen"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Kon de bestandsindicator %d niet openen"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Aanmaken subproces-IPC is mislukt"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Uitvoeren van de compressor is mislukt "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Probleem bij het afsluiten van het bestand %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Probleem bij het hernoemen van '%s' naar '%s'"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Probleem bij het ontlinken van het bestand %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Probleem bij het synchroniseren van het bestand"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Geen sleutelring geïnstalleerd in %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Lege pakketcache"
@@ -2650,59 +2628,59 @@ msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet"
msgid "The package cache was built for a different architecture"
msgstr "De pakketcache was aangemaakt voor een andere architectuur"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Vereisten"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Voor-Vereisten"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Suggesties"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Aanbevelingen"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Conflicteert met"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Vervangt"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Verouderd"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Breekt"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Vult aan"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "belangrijk"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "noodzakelijk"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standaard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "optioneel"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2803,12 +2781,12 @@ msgstr "%s wordt geopend"
msgid "Line %u too long in source list %s."
msgstr "Regel %u van de bronlijst %s is te lang."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misvormde regel %u in bronlijst %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
@@ -2852,7 +2830,7 @@ msgstr ""
"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
"gevonden worden."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2860,11 +2838,11 @@ msgstr ""
"Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
"veroorzaakt worden door vastgehouden pakketten."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2917,12 +2895,12 @@ msgstr ""
"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
"'enter' te drukken."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Kan geen geschikt pakketsysteemtype bepalen"
@@ -2981,14 +2959,14 @@ msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Fout tijdens verwerken van %s (FindPkg)"
@@ -3011,28 +2989,28 @@ msgstr ""
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Pakket %s %s werd niet gevonden bij het verwerken van de "
"bestandsafhankelijkheden"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Pakketlijsten worden ingelezen"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Voorziene bestanden worden verzameld"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
@@ -3045,44 +3023,44 @@ msgstr "herbenoeming is mislukt, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hash-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kon Release-bestand %s niet ontleden"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet "
@@ -3090,12 +3068,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fout: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3104,7 +3082,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:1700
+#: apt-pkg/acquire-item.cc:1705
#, fuzzy, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3113,7 +3091,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:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3121,31 +3099,31 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kon Release-bestand %s niet ontleden"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Geen secties in Release-bestand %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Geen Hash-vermelding in Release-bestand %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Geen 'Date'-vermelding in Release-bestand %s"
@@ -3245,22 +3223,22 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n"
msgid "Source list entries for this disc are:\n"
msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "%i records weggeschreven.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "%i records weggeschreven met %i missende bestanden.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3277,6 +3255,17 @@ msgstr "Kan geen authenticatierecord vinden voor: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-som komt niet overeen voor: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Geen sleutelring geïnstalleerd in %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3349,117 +3338,117 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "%s wordt geïnstalleerd"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "%s wordt geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "%s wordt verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s wordt volledig verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "De verdwijning van %s wordt opgemerkt"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Post-installatie-trigger %s wordt uitgevoerd"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Map '%s' ontbreekt"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Kon het bestand '%s' niet openen"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "%s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "%s wordt uitgepakt"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Configuratie van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s is geïnstalleerd"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s is verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Volledige verwijdering van %s wordt voorbereid"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s is volledig verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet "
"aangekoppeld?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "dpkg wordt uitgevoerd"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen "
"(MaxReports) al is bereikt"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "problemen met vereisten - wordt niet geconfigureerd"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3467,7 +3456,7 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
"eerdere mislukking."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3483,7 +3472,13 @@ msgstr ""
"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
"over onvoldoende-geheugen."
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3517,6 +3512,22 @@ msgstr ""
msgid "Not locked"
msgstr "Niet vergrendeld"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Klaar"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is "
+#~ "niet bijgewerkt en de oude indexbestanden zullen worden gebruikt. GPG-"
+#~ "fout: %s: %s\n"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Niet-bestaand bestand %s wordt overgeslagen"
diff --git a/po/nn.po b/po/nn.po
index 89489066a..f0d06112f 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+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"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -645,7 +645,7 @@ msgstr "Avbryt."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -830,7 +830,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Mislukkast"
@@ -1014,11 +1014,11 @@ msgstr "Klarte ikkje behandla byggjekrava"
msgid "Changelog for %s (%s)"
msgstr "Koplar til %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1104,7 +1104,7 @@ msgstr ""
"til apt-get(8), sources.list(5) og apt.conf(5).\n"
" APT har superku-krefter.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1175,8 +1175,7 @@ msgid "%s was already not hold.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
@@ -1316,8 +1315,8 @@ msgstr "Tidsavbrot p samband"
msgid "Server closed the connection"
msgstr "Tenaren lukka sambandet"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Lesefeil"
@@ -1330,8 +1329,8 @@ msgid "Protocol corruption"
msgstr "Protokollydeleggjing"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Skrivefeil"
@@ -1385,7 +1384,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1412,91 +1411,86 @@ msgstr "Sprjing"
msgid "Unable to invoke "
msgstr "Klarte ikkje starta "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Koplar til %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot p sambandet"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Klarte ikkje kopla til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Koplar til %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Klarte ikkje sl opp %s"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Mellombels feil ved oppslag av %s"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikkje kopla til %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1534,53 +1528,53 @@ msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Intern feil"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Klarte ikkje lesa %s"
@@ -1699,7 +1693,7 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Klarte ikkje skriva til %s"
@@ -1842,8 +1836,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Klarte ikkje opna DB-fila %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Klarte ikkje f status til %s"
@@ -1856,87 +1850,87 @@ msgstr "Arkivet har ingen kontrollpost"
msgid "Unable to get a cursor"
msgstr "Klarte ikkje f peikar"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ": Klarte ikkje lesa katalogen %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ": Klarte ikkje f status til %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr ": "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "F: Det er feil ved fila "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Klarte ikkje sl opp %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Treklatring mislukkast"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Klarte ikkje opna %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Klarte ikkje lesa lenkja %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Klarte ikkje oppheva lenkja %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Klarte ikkje lenkja %s til %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink-grensa p %sB er ndd.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Arkivet har ikkje noko pakkefelt"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikehaldaren er %s, ikkje %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har inga overstyringsoppfring\n"
@@ -2010,7 +2004,7 @@ msgstr "Klarte ikkje lesa under utrekning av MD5"
msgid "Problem unlinking %s"
msgstr "Problem ved oppheving av lenkje til %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Klarte ikkje endra namnet p %s til %s"
@@ -2155,54 +2149,54 @@ msgstr "Klarte ikkje skriva fila %s"
msgid "Failed to close file %s"
msgstr "Klarte ikkje lukka fila %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Stigen %s er for lang"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Pakkar ut %s meir enn in gong"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Katalogen %s er avleidd"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Pakken prver skriva til avleiingsmlet %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Avleiingsstigen er for lang"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Fann ikkje noden i nkkelbtta"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Stigen er for lang"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Skriv over pakketreff utan versjon for %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Klarte ikkje f status til %s"
@@ -2282,30 +2276,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Fann ikkje utvalet %s"
@@ -2375,16 +2369,6 @@ msgstr "%c%s ... Feil"
msgid "%c%s... Done"
msgstr "%c%s ... Ferdig"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s ... Ferdig"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2496,69 +2480,63 @@ msgstr "Underprosessen %s mottok ein segmenteringsfeil."
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok ein segmenteringsfeil."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s returnerte ein feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avslutta uventa"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Klarte ikkje opna fila %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Klarte ikkje opna ryr for %s"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Klarte ikkje oppretta underprosessen IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Klarte ikkje kyra komprimeringa "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "lese, har framleis %lu att lesa, men ingen att"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "skrive, har framleis %lu att skrive, men klarte ikkje"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Problem ved lsing av fila"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem ved synkronisering av fila"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem ved oppheving av lenkje til fila"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problem ved synkronisering av fila"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Avbryt installasjon."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Tomt pakkelager"
@@ -2585,59 +2563,59 @@ msgstr "APT stttar ikkje versjonssystemet %s"
msgid "The package cache was built for a different architecture"
msgstr "Pakkelageret er bygd for ein annan arkitektur"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Krav"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Forkrav"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Forslag"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Tilrdingar"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Konflikt"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Byter ut"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Foreldar"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "viktig"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "pkravd"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "vanleg"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "valfri"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "tillegg"
@@ -2738,12 +2716,12 @@ msgstr "Opnar %s"
msgid "Line %u too long in source list %s."
msgstr "Linja %u i kjeldelista %s er for lang."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Misforma linje %u i kjeldelista %s (type)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
@@ -2783,7 +2761,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:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2791,12 +2769,12 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar "
"som er haldne tilbake."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2850,12 +2828,12 @@ msgstr ""
" %s\n"
"i stasjonen %s og trykk Enter.\n"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet %s er ikkje sttta"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
@@ -2909,14 +2887,14 @@ msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Feil ved behandling av %s (FindPkg)"
@@ -2938,26 +2916,26 @@ msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Jss, du har overgtt talet p krav som APT kan handtera."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Les pakkelister"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Samlar inn filtilbod"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "IU-feil ved lagring av kjeldelager"
@@ -2970,54 +2948,54 @@ msgstr "endring av namn mislukkast, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3026,7 +3004,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:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3034,38 +3012,38 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, 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:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Feil storleik"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Merk, vel %s i staden for %s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ugyldig linje i avleiingsfila: %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
@@ -3162,22 +3140,22 @@ msgstr "Skriv ny kjeldeliste\n"
msgid "Source list entries for this disc are:\n"
msgstr "Kjeldelisteoppfringar for denne disken er:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skreiv %i postar.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skreiv %i postar med %i manglande filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
@@ -3192,6 +3170,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Feil MD5-sum"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Avbryt installasjon."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3255,119 +3244,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Installert: "
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Koplar til %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Klarte ikkje fjerna %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Listekatalogen %spartial manglar."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Klarte ikkje opna fila %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Opnar %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Installert: "
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Tilrdingar"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Klarte ikkje fjerna %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3379,7 +3368,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3409,6 +3404,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s ... Ferdig"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Opnar oppsettsfila %s"
diff --git a/po/pl.po b/po/pl.po
index b8643a951..d38b5d56c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-07-28 21:53+0200\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -161,7 +161,7 @@ msgid " Version table:"
msgstr " Tabela wersji:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -640,7 +640,7 @@ msgstr "Przerwane."
msgid "Do you want to continue [Y/n]? "
msgstr "Kontynuować [T/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
@@ -849,7 +849,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Nie udało się"
@@ -1052,11 +1052,11 @@ msgstr "Nie udało się przetworzyć zależności dla budowania"
msgid "Changelog for %s (%s)"
msgstr "Dziennik zmian %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Obsługiwane moduły:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1144,7 +1144,7 @@ msgstr ""
"apt-get(8), sources.list(5) i apt.conf(5).\n"
" Ten APT ma moce Super Krowy.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1222,8 +1222,7 @@ msgid "%s was already not hold.\n"
msgstr "%s został już odznaczony jako zatrzymany.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie było go"
@@ -1386,8 +1385,8 @@ msgstr "Przekroczenie czasu połączenia"
msgid "Server closed the connection"
msgstr "Serwer zamknął połączenie"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Błąd odczytu"
@@ -1400,8 +1399,8 @@ msgid "Protocol corruption"
msgstr "Naruszenie zasad protokołu"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Błąd zapisu"
@@ -1455,7 +1454,7 @@ msgstr "Przekroczony czas połączenia gniazda danych"
msgid "Unable to accept connection"
msgstr "Nie udało się przyjąć połączenia"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Nie udało się obliczyć skrótu pliku"
@@ -1482,93 +1481,88 @@ msgstr "Info"
msgid "Unable to invoke "
msgstr "Nie można wywołać "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Łączenie z %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nie udało się utworzyć gniazda dla %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nie udało się zainicjalizować połączenia z %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nie udało się połączyć z %s:%s (%s), przekroczenie czasu połączenia"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nie udało się połączyć z %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Łączenie z %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nie udało się przetłumaczyć nazwy \"%s\""
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\""
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nie udało się połączyć z %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Nie udało się uruchomić gpgv by zweryfikować podpis (czy gpgv jest "
"zainstalowane?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Nieznany błąd podczas uruchamiania gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Następujące podpisy były błędne:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1608,53 +1602,53 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Operacja select nie powiodła się"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Przekroczenie czasu połączenia"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Błąd przy pisaniu do pliku wyjściowego"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Błąd przy pisaniu do pliku"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Błąd przy pisaniu do pliku"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Błąd czytania z serwera"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Błędne dane nagłówka"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Połączenie nie powiodło się"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Błąd wewnętrzny"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Nie można czytać %s"
@@ -1780,7 +1774,7 @@ msgstr ""
" -c=? Czyta wskazany plik konfiguracyjny.\n"
" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Nie udało się pisać do %s"
@@ -1928,8 +1922,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Nie udało się otworzyć pliku bazy %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Nie udało się wykonać operacji stat na %s"
@@ -1942,87 +1936,87 @@ msgstr "Archiwum nie posiada rekordu kontrolnego"
msgid "Unable to get a cursor"
msgstr "Nie udało się pobrać kursora"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Nie udało się odczytać katalogu %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Nie można wykonać operacji stat na %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Błędy odnoszą się do pliku "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Nie udało się przetłumaczyć nazwy %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Przejście po drzewie nie powiodło się"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Nie udało się otworzyć %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Odłączenie %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Nie udało się odczytać dowiązania %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Nie udało się usunąć %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nie udało się dowiązać %s do %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Archiwum nie posiadało pola pakietu"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nie posiada wpisu w pliku override\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " opiekunem %s jest %s, a nie %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nie posiada wpisu w pliku override źródeł\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nie posiada również wpisu w pliku override binariów\n"
@@ -2096,7 +2090,7 @@ msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5"
msgid "Problem unlinking %s"
msgstr "Problem przy usuwaniu %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Nie udało się zmienić nazwy %s na %s"
@@ -2241,54 +2235,54 @@ msgstr "Nie udało się zapisać pliku %s"
msgid "Failed to close file %s"
msgstr "Nie udało się zamknąć pliku %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Ścieżka %s jest zbyt długa"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Wypakowanie %s więcej niż raz"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Ominięcie katalogu %s"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Pakiet próbuje pisać do celu ominięcia %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Zbyt długa ścieżka ominięcia"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Katalog %s został zastąpiony obiektem nie będącym katalogiem"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Nie udało się znaleźć węzła w jego kubełku haszującym"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Ścieżka jest zbyt długa"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Nadpisujący pakiet nie pasuje z wersją %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Plik %s/%s nadpisuje plik w pakiecie %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Nie można wykonać operacji stat na %s"
@@ -2372,30 +2366,30 @@ msgstr ""
"zostało wyłączone przez użytkownika."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lidni %lig %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lig %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Nie odnaleziono wyboru %s"
@@ -2467,16 +2461,6 @@ msgstr "%c%s... Błąd!"
msgid "%c%s... Done"
msgstr "%c%s... Gotowe"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Gotowe"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2593,69 +2577,63 @@ msgstr "Podproces %s spowodował naruszenie ochrony pamięci."
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s otrzymał sygnał %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s zwrócił kod błędu (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s zakończył się niespodziewanie"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Nie udało się otworzyć pliku %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Nie udało się otworzyć deskryptora pliku %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Nie udało się utworzyć IPC z podprocesem"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Nie udało się uruchomić kompresora "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "należało zapisać jeszcze %llu, ale nie udało się to"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem przy zamykaniu pliku %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem przy zapisywaniu pliku %s w %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem przy odlinkowywaniu pliku %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problem przy zapisywaniu pliku na dysk"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Brak zainstalowanej bazy kluczy w %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Pusty magazyn podręczny pakietów"
@@ -2681,59 +2659,59 @@ msgstr "Ta wersja APT nie obsługuje systemu wersji \"%s\""
msgid "The package cache was built for a different architecture"
msgstr "Ten magazyn podręczny pakietów został zbudowany dla innej architektury"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Wymaga"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Wymaga wstępnie"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Sugeruje"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Poleca"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "W konflikcie z"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Zastępuje"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Dezaktualizuje"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Narusza zależności"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Rozszerza"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "ważny"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "wymagany"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standardowy"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opcjonalny"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "dodatkowy"
@@ -2835,12 +2813,12 @@ msgstr "Otwieranie %s"
msgid "Line %u too long in source list %s."
msgstr "Linia %u w liście źródeł %s jest zbyt długa."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
@@ -2885,7 +2863,7 @@ msgstr ""
"Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego "
"archiwum."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2893,11 +2871,11 @@ msgstr ""
"Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane "
"zatrzymanymi pakietami."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2947,12 +2925,12 @@ msgstr "Metoda %s nie uruchomiła się poprawnie"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "System pakietów \"%s\" nie jest obsługiwany"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nie udało się określić odpowiedniego typu systemu pakietów"
@@ -3007,14 +2985,14 @@ msgstr "Magazyn podręczny ma niezgodny system wersji"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
@@ -3035,27 +3013,27 @@ msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć.
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Czytanie list pakietów"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Zbieranie zapewnień plików"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
@@ -3068,12 +3046,12 @@ msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
msgid "MD5Sum mismatch"
msgstr "Błędna suma MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Błędna suma kontrolna"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3082,16 +3060,16 @@ msgstr ""
"Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release "
"(nieprawidłowy wpis sources.list lub nieprawidłowy plik)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3100,27 +3078,27 @@ msgstr ""
"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
"repozytorium nie będą wykonywane."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i "
"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Błąd GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3129,7 +3107,7 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3138,38 +3116,38 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Błędny rozmiar"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nie udało się przeanalizować pliku Release %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Brak sekcji w pliku Release %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Brak wpisu Hash w pliku Release %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nieprawidłowy wpis Date w pliku Release %s"
@@ -3269,22 +3247,22 @@ msgstr "Zapisywanie nowej listy źródeł\n"
msgid "Source list entries for this disc are:\n"
msgstr "Źródła dla tej płyty to:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapisano %i rekordów.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapisano %i rekordów z %i brakującymi plikami.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapisano %i rekordów z %i niepasującymi plikami\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n"
@@ -3299,6 +3277,17 @@ msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
msgid "Hash mismatch for: %s"
msgstr "Błędna suma kontrolna dla: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Brak zainstalowanej bazy kluczy w %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3375,115 +3364,115 @@ msgstr ""
"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
"prawidłowego komunikatu o błędzie"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Konfigurowanie %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Usuwanie %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Całkowite usuwanie %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Proszę odnotować zniknięcie %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Uruchamianie wyzwalacza post-installation %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Brakuje katalogu \"%s\""
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Nie udało się otworzyć pliku \"%s\""
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Przygotowywanie %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Rozpakowywanie %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Przygotowywanie do konfiguracji %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Pakiet %s został zainstalowany"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Przygotowywanie do usunięcia %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Pakiet %s został usunięty"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Przygotowywanie do całkowitego usunięcia %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Pakiet %s został całkowicie usunięty"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie jest "
"zamontowane?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Uruchamianie dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3491,7 +3480,7 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
"przyczyna niepowodzenia leży w poprzednim błędzie."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3507,7 +3496,13 @@ msgstr ""
"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
"braku wolnej pamięci"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3544,8 +3539,21 @@ msgstr ""
msgid "Not locked"
msgstr "Niezablokowany"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Gotowe"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano "
+#~ "repozytorium i w dalszym ciągu będą używane poprzednie pliki indeksu. "
+#~ "Błąd GPG %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Pomijanie nieistniejącego pliku %s"
diff --git a/po/pt.po b/po/pt.po
index febe90d83..053287494 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-06-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -157,7 +157,7 @@ msgid " Version table:"
msgstr " Tabela de Versão:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -636,7 +636,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
@@ -830,7 +830,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "A calcular a actualização... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Falhou"
@@ -1032,11 +1032,11 @@ msgstr "Falhou processar as dependências de compilação"
msgid "Changelog for %s (%s)"
msgstr "Changlog para %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1126,7 +1126,7 @@ msgstr ""
"apt-get(8), sources.list(5) e apt.conf(5)\n"
" Este APT tem Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1201,8 +1201,7 @@ msgid "%s was already not hold.\n"
msgstr "%s já estava para não manter.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperou por %s mas não estava lá"
@@ -1360,8 +1359,8 @@ msgstr "Foi atingido o tempo limite de ligação"
msgid "Server closed the connection"
msgstr "O servidor fechou a ligação"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Erro de leitura"
@@ -1374,8 +1373,8 @@ msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Erro de escrita"
@@ -1429,7 +1428,7 @@ msgstr "Ligação de socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
@@ -1456,94 +1455,89 @@ msgstr "Pesquisa"
msgid "Unable to invoke "
msgstr "Não foi possível invocar "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "A Ligar a %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Não posso iniciar a ligação para %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Não foi possível ligar em %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "A ligar a %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Não foi possível resolver '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Falha temporária a resolver '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Não foi possível ligar a %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
"digital da chave?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Pelo menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Não foi possível executar 'gpgv' para verificar a assinatura (o gpgv está "
"instalado?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido ao executar gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1583,53 +1577,53 @@ msgstr "Este servidor HTTP possui suporte de range errado"
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "A selecção falhou"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "O tempo da ligação expirou"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Erro ao escrever para o ficheiro de saída"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Erro ao escrever para ficheiro"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Erro ao escrever para o ficheiro"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "A ligação falhou"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Erro interno"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Não foi possível ler %s"
@@ -1757,7 +1751,7 @@ msgstr ""
" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Não conseguiu escrever para %s"
@@ -1903,8 +1897,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Falha stat %s"
@@ -1917,87 +1911,87 @@ msgstr "O arquivo não tem registo de controlo"
msgid "Unable to get a cursor"
msgstr "Não foi possível obter um cursor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Não foi possível ler o directório %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Não foi possível fazer stat %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Os erros aplicam-se ao ficheiro "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Falhou resolver %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Falhou ao percorrer a árvore"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Falhou abrir %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Falhou o readlink %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Falhou o unlink %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falhou ligar %s a %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Arquivo não possuía campo package"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " o maintainer de %s é %s, não %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui fonte de entrada de 'override'\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada binária de 'override'\n"
@@ -2071,7 +2065,7 @@ msgstr "Falhou ler durante o cálculo de MD5"
msgid "Problem unlinking %s"
msgstr "Problema ao executar unlinking %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Falhou renomear %s para %s"
@@ -2216,54 +2210,54 @@ msgstr "Falhou escrever o ficheiro %s"
msgid "Failed to close file %s"
msgstr "Falhou fechar o ficheiro %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "O caminho %s é demasiado longo"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "A descompactar %s mais de uma vez"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "O directório %s é desviado"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "O pacote está a tentar escrever no alvo de desvio %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "O caminho de desvio é muito longo"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "O directório %s está a ser substituído por um não-directório"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Falhou localizar o nó no seu hash bucket"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "O caminho é demasiado longo"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Substituir o pacote correspondente sem versão para %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "O ficheiro %s/%s substitui o que está no pacote %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Não foi possível fazer stat %s"
@@ -2345,30 +2339,30 @@ msgstr ""
"está desabilitado pelo utilizador."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "A selecção %s não foi encontrada"
@@ -2441,16 +2435,6 @@ msgstr "%c%s... Erro !"
msgid "%c%s... Done"
msgstr "%c%s... Pronto"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Pronto"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2570,69 +2554,63 @@ msgstr "O sub-processo %s recebeu uma falha de segmentação."
msgid "Sub-process %s received signal %u."
msgstr "O sub-processo %s recebeu o sinal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "O sub-processo %s retornou um código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O sub-processo %s terminou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Não foi possível abrir ficheiro o %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Não foi possível abrir o descritor de ficheiro %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Falhou criar subprocesso IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Falhou executar compactador "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "escritos, ainda restam %llu para escrever mas não foi possível"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problema ao fechar o ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problema ao renomear o ficheiro %s para %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problema ao remover o link do ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problema sincronizando o ficheiro"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Nenhum keyring instalado em %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache de pacotes vazia"
@@ -2658,59 +2636,59 @@ msgstr "Este APT não suporta o sistema de versões '%s'"
msgid "The package cache was built for a different architecture"
msgstr "A cache de pacotes foi gerada para uma arquitectura diferente"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Depende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Pré-Depende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Sugere"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Recomenda"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Em Conflito"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Substitui"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Obsoleta"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Estraga"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Aumenta"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "necessário"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "padrão"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2813,12 +2791,12 @@ msgstr "A abrir %s"
msgid "Line %u too long in source list %s."
msgstr "Linha %u é demasiado longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
@@ -2862,7 +2840,7 @@ msgstr ""
"O pacote %s necessita ser reinstalado, mas não foi possível encontrar um "
"repositório para o mesmo."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2870,13 +2848,13 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
"estragados."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2927,12 +2905,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"Não foi possível determinar um tipo de sistema de empacotamento adequado"
@@ -2990,14 +2968,14 @@ msgstr "A cache possui um sistema de versões incompatível"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Ocorreu um erro ao processar %s (%s%d)"
@@ -3023,27 +3001,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "A ler as listas de pacotes"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "A obter File Provides"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Erro de I/O ao gravar a cache de código fonte"
@@ -3056,12 +3034,12 @@ msgstr "falhou renomear, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum não coincide"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Código de verificação hash não coincide"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3070,18 +3048,18 @@ msgstr ""
"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
"errada em sources.list ou ficheiro malformado)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3090,15 +3068,15 @@ msgstr ""
"O ficheiro Release para %s está expirado (inválido desde %s). Não serão "
"aplicadas as actualizações para este repositório."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Ocorreu um erro durante a verificação da assinatura. O repositório não está "
@@ -3106,12 +3084,12 @@ msgstr ""
"GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erro GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3121,7 +3099,7 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3130,7 +3108,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:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3138,31 +3116,31 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Não foi possível fazer parse ao ficheiro Release %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Nenhuma secção, no ficheiro Release %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Nenhuma entrada hash no ficheiro Release %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
@@ -3262,22 +3240,22 @@ msgstr "A escrever lista de novas source\n"
msgid "Source list entries for this disc are:\n"
msgstr "As entradas de listas de Source para este Disco são:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Escreveu %i registos.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3294,6 +3272,17 @@ msgstr "Não foi possível encontrar registo de autenticação para: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash não coincide para: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "O ficheiro %s não começa com uma mensagem assinada"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Nenhum keyring instalado em %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3366,115 +3355,115 @@ msgstr "Preparar para receber solução"
msgid "External solver failed without a proper error message"
msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Executar resolvedor externo"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "A instalar %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "A configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "A remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "A notar o desaparecimento de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "A correr o 'trigger' de pós-instalação %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Falta o directório '%s'"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Não foi possível abrir ficheiro o '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "A preparar %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "A desempacotar %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "A preparar para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "A preparar a remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "A preparar para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Remoção completa de %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está "
"montado?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "A correr o dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "A operação foi interrompida antes de poder terminar"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "problemas de dependências - deixando por configurar"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3482,7 +3471,7 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
"de seguimento de um erro anterior."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3498,7 +3487,16 @@ msgstr ""
"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
"memória esgotada"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
+"cheio"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3535,8 +3533,21 @@ msgstr ""
msgid "Not locked"
msgstr "Sem acesso exclusivo"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "O ficheiro %s não começa com uma mensagem assinada"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Pronto"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Ocorreu um erro durante a verificação da assinatura. O repositório não "
+#~ "está actualizado e serão utilizados os ficheiros anteriores de índice. "
+#~ "Erro do GPG: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "A saltar ficheiro %s inexistente"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0a5317c70..84554a950 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -110,6 +110,7 @@ msgstr "Você deve passar exatamente um padrão"
#: cmdline/apt-cache.cc:1361
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
+"Este comando é obsoleto. Por favor use 'apt-mark showauto' em vez disso."
#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
#, c-format
@@ -157,7 +158,7 @@ msgid " Version table:"
msgstr " Tabela de versão:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -298,7 +299,7 @@ msgstr "S"
#: cmdline/apt-get.cc:140
msgid "N"
-msgstr ""
+msgstr "N"
#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
#, c-format
@@ -453,7 +454,7 @@ msgstr "O pacote %s não tem candidato para instalação"
#: cmdline/apt-get.cc:725
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "Pacotes virtuais como '%s' não podem ser removidos\n"
#. TRANSLATORS: Note, this is not an interactive question
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -641,7 +642,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "Você quer continuar [S/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
@@ -686,12 +687,12 @@ msgstr[1] ""
#: cmdline/apt-get.cc:1423
msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
+msgstr "Nota: isto é feito automaticamente pelo dpkg."
#: cmdline/apt-get.cc:1561
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorar indisponibilidade da versão '%s' do pacote '%s'"
#: cmdline/apt-get.cc:1593
#, fuzzy, c-format
@@ -702,7 +703,7 @@ msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
#: cmdline/apt-get.cc:1631
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorar versão indisponível '%s' do pacote '%s'"
#: cmdline/apt-get.cc:1647
msgid "The update command takes no arguments"
@@ -830,12 +831,14 @@ msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
+"Este comando é obsoleto. Por favor use 'apt-mark auto' e 'apt-mark manual' "
+"em vez disso."
#: cmdline/apt-get.cc:2185
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Falhou"
@@ -854,12 +857,12 @@ msgstr "Impossível criar trava no diretório de download"
#: cmdline/apt-get.cc:2388
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgstr "Não foi possível encontrar a fonte para baixar a versão '%s' de '%s'"
#: cmdline/apt-get.cc:2393
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "Baixando %s %s"
#: cmdline/apt-get.cc:2453
msgid "Must specify at least one package to fetch source for"
@@ -876,6 +879,9 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
+"OBSERVAÇÃO: \\\"%s\\\" pacote mantido na versão \\\"%s\\\" do sistema de "
+"controle em:\n"
+"%s\n"
#: cmdline/apt-get.cc:2515
#, c-format
@@ -884,6 +890,10 @@ msgid ""
"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
+"Por favor, use:\n"
+"bzr branch %s\n"
+"para obter as atualizações mais novas do pacote (possivelmente não "
+"lançado).\n"
#: cmdline/apt-get.cc:2568
#, c-format
@@ -954,6 +964,8 @@ msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"Nenhum informação de arquitetura disponível for %s. Veja apt.conf(5) APT:: "
+"Arquiteturas para configuração"
#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
#, c-format
@@ -1027,11 +1039,11 @@ msgstr "Falhou ao processar as dependências de construção"
msgid "Changelog for %s (%s)"
msgstr "Conectando em %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Módulos para os quais há suporte:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1119,13 +1131,17 @@ msgstr ""
"para mais informações e opções.\n"
" Este APT tem Poderes de Super Vaca.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"NOTA: Esta é apenas uma simulação!\n"
+"O apt-get precisa de privilégios de root para uma execução real.\n"
+"Mantenha em mente que a trava está desativada,\n"
+"portanto não dependa da relevância para a situação real atual!"
#: cmdline/acqprogress.cc:60
msgid "Hit "
@@ -1190,8 +1206,7 @@ msgid "%s was already not hold.\n"
msgstr "%s já é a versão mais nova.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperado %s mas este não estava lá"
@@ -1208,7 +1223,7 @@ msgstr "Falhou ao abrir %s"
#: cmdline/apt-mark.cc:332
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Execução do dpkg falhou. Você é o root?"
#: cmdline/apt-mark.cc:379
msgid ""
@@ -1231,6 +1246,27 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
+"Uso: apt-mark [options] {auto|manual} pacote1 [pacote2 ...]\n"
+"\n"
+"apt-mark é uma interface simples de linha de comando para marcar\n"
+"pacotes como instalados manual ou automaticamente. Também pode\n"
+"listar as marcas.\n"
+"\n"
+"Comandos:\n"
+"auto - Marca os pacotes como automaticamente instalados\n"
+"manual - Marca os pacotes como manualmente instalados\n"
+"\n"
+"Opções:\n"
+"-h Este texto de ajuda\n"
+"-q Registro de saída - sem indicador de progresso\n"
+"-qq Sem saída, a não ser para erros\n"
+"-s Sem ação. Apenas imprime o que será feito.\n"
+"-f marcas de leitura/gravação auto/manual no arquivo dado\n"
+"-c=? Ler este arquivo de configuração\n"
+"-o=? Definir uma opção de configuração arbitrária, exemplo -o dir::cache=/"
+"tmp\n"
+"Veja as páginas do manual do apt-mark(8) e do apt.conf(5) para mais "
+"informações"
#: methods/cdrom.cc:203
#, c-format
@@ -1329,8 +1365,8 @@ msgstr "Conexão expirou"
msgid "Server closed the connection"
msgstr "Servidor fechou a conexão"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Erro de leitura"
@@ -1343,8 +1379,8 @@ msgid "Protocol corruption"
msgstr "Corrupção de protocolo"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Erro de escrita"
@@ -1398,7 +1434,7 @@ msgstr "Conexão do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar conexão"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problema criando o hash do arquivo"
@@ -1425,95 +1461,90 @@ msgstr "Pesquisa"
msgid "Unable to invoke "
msgstr "Impossível invocar "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectando em %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Não foi possível iniciar a conexão para %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Não foi possível conectar em %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Conectando a %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Não foi possível resolver '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Falha temporária resolvendo '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Impossível conectar em %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Assinatura boa, mas não foi possível determinar a impressão "
"digital da chave?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Ao menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
"instalado?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido executando gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1523,7 +1554,7 @@ msgstr ""
#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "Arquivos vazios não são arquivos válidos"
#: methods/http.cc:394
msgid "Waiting for headers"
@@ -1553,53 +1584,53 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Seleção falhou"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Erro escrevendo para arquivo de saída"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Erro escrevendo para arquivo"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Erro escrevendo para o arquivo"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Conexão falhou"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Erro interno"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
@@ -1617,7 +1648,7 @@ msgstr "Impossível mudar para %s"
#: methods/mirror.cc:280
#, c-format
msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "Nenhum arquivo de espelho \\\"%s\\\" encontrado "
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
@@ -1629,7 +1660,7 @@ msgstr "Não foi possível abrir arquivo %s"
#: methods/mirror.cc:442
#, c-format
msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[Espelho: %s]"
#: methods/rred.cc:491
#, c-format
@@ -1637,6 +1668,8 @@ msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
+"Não foi possível atualizar %s com mmap e com o arquivo usado na operação - a "
+"atualização parece estar corrompida."
#: methods/rred.cc:496
#, c-format
@@ -1644,6 +1677,8 @@ msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
+"Não foi possível atualizar %s com mmap (mas nenhuma falha específica do "
+"mmap) - a atualização parece estar corrompida."
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
@@ -1725,7 +1760,7 @@ msgstr ""
" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Impossível escrever para %s"
@@ -1873,8 +1908,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Impossível abrir o arquivo BD %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Falhou ao executar \"stat\" %s"
@@ -1887,87 +1922,87 @@ msgstr "Repositório não possui registro de controle"
msgid "Unable to get a cursor"
msgstr "Impossível obter um cursor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Impossível ler o diretório %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Impossível executar \"stat\" em %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Erros que se aplicam ao arquivo "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Falhou ao resolver %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Falhou ao percorrer a árvore"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Falhou ao abrir %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Falhou ao executar \"readlink\" %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Falhou ao executar \"unlink\" %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Falhou ao ligar %s a %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limite DeLink de %sB atingido.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Repositório não possuía campo pacote"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " mantenedor de %s é %s, não %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui entrada override fonte\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada override binária\n"
@@ -2041,7 +2076,7 @@ msgstr "Falhou ao ler durante o cálculo MD5"
msgid "Problem unlinking %s"
msgstr "Problema removendo %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Falhou ao renomear %s para %s"
@@ -2188,54 +2223,54 @@ msgstr "Falhou ao escrever arquivo %s"
msgid "Failed to close file %s"
msgstr "Falhou ao fechar arquivo %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "O caminho %s é muito longo"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Desempacotando %s mais de uma vez"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "O diretório %s é desviado (\"diverted\")"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "O pacote está tentando escrever no alvo do desvio %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "O caminho de desvio é muito longo"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "O diretório %s está sendo substituído por um não-diretório"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Falha ao localizar nó em seu \"hash bucket\""
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "O caminho é muito longo"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Sobrescrita de pacote não combina com nenhuma versão para %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Impossível executar \"stat\" em %s"
@@ -2300,6 +2335,8 @@ msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+"MMap dinâmico ficou sem espaço. Aumente o tamanho de APT::Cache-Start. Valor "
+"atual: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:440
#, c-format
@@ -2307,37 +2344,41 @@ msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
+"Não é possível aumentar o tamanho do MMap pois o limite de %lu bytes já foi "
+"alcançado."
#: apt-pkg/contrib/mmap.cc:443
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
+"Não é possível aumentar o tamanho do MMap pois o aumento automático está "
+"desativado pelo usuário."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Seleção %s não encontrada"
@@ -2409,16 +2450,6 @@ msgstr "%c%s... Erro!"
msgid "%c%s... Done"
msgstr "%c%s... Pronto"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Pronto"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2503,23 +2534,24 @@ msgstr "Não foi possível obter trava %s"
#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "Lista de aquivos não pode ser criada como '%s' não é um diretório"
#: apt-pkg/contrib/fileutl.cc:426
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "Ignorando '%s' no diretório '%s' pois não é um arquivo comum"
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgstr "Ignorando '%s' no diretório '%s' pois não tem extensão de arquivo"
#: apt-pkg/contrib/fileutl.cc:453
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
+"Ignorando '%s' no diretório '%s' pois tem uma extensão de arquivo inválida"
#: apt-pkg/contrib/fileutl.cc:840
#, c-format
@@ -2531,69 +2563,63 @@ msgstr "Sub-processo %s recebeu uma falha de segmentação."
msgid "Sub-process %s received signal %u."
msgstr "Sub-processo %s recebeu uma falha de segmentação."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Sub-processo %s retornou um código de erro (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-processo %s finalizou inesperadamente"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Não foi possível abrir arquivo %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Não foi possível abrir \"pipe\" para %s"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Falhou ao criar sub-processo IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Falhou ao executar compactador "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Problema fechando o arquivo"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problema sincronizando o arquivo"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Problema removendo o arquivo"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problema sincronizando o arquivo"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abortando instalação."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache de pacotes vazio"
@@ -2620,59 +2646,59 @@ msgstr "Este APT não suporta o sistema de versões '%s'"
msgid "The package cache was built for a different architecture"
msgstr "O cache de pacotes foi gerado para uma arquitetura diferente"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Depende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Pré-Depende"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Sugere"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Recomenda"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Conflita"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Substitui"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Obsoleta"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Quebra"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
-msgstr ""
+msgstr "Aprimora"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "requerido"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "padrão"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2777,12 +2803,12 @@ msgstr "Abrindo %s"
msgid "Line %u too long in source list %s."
msgstr "Linha %u muito longa na lista de fontes %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
@@ -2793,6 +2819,8 @@ msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Não é possível executar imediatamente a configuração em '%s'. Por favor veja "
+"man 5 apt.conf em APT::Immediate-Configure para mais detalhes. (%d)"
#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
#, fuzzy, c-format
@@ -2824,7 +2852,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"arquivo para o mesmo."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2832,11 +2860,11 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2888,12 +2916,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' não é suportado"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossível determinar um tipo de sistema de empacotamento aplicável."
@@ -2926,6 +2954,8 @@ msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"O valor '%s' é inválido para APT::Default-Release como tal lançamento não "
+"está disponível na origem"
#: apt-pkg/policy.cc:399
#, fuzzy, c-format
@@ -2948,14 +2978,14 @@ msgstr "O cache possui um sistema de versões incompatível"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
@@ -2981,27 +3011,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Uau, você excedeu o número de dependências que este APT é capaz de suportar."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Pacote %s %s não foi encontrado enquanto processando dependências de arquivo"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Lendo listas de pacotes"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Coletando Arquivo \"Provides\""
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Erro de E/S ao gravar cache fonte"
@@ -3014,53 +3044,59 @@ msgstr "renomeação falhou, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hash Sum incorreto"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"Não é possível encontrar entrada '%s' esperada no arquivo de Release "
+"(entrada incorreta em sources.list ou arquivo corrompido)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"Arquivo de lançamento para %s está expirado (inválido desde %s). "
+"Atualizações desse repositório não serão aplicadas."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "Distribuição em conflito: %s (esperado %s mas recebido %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
+"Um erro ocorreu durante a verificação da assinatura. O repositório não foi "
+"atualizado eo índice anterior de arquivo será usado. Erro GPG: %s:%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "Erro GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3070,7 +3106,7 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3079,7 +3115,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:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3087,31 +3123,31 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
"\" para o pacote %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Tamanho incorreto"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Nota, selecionando %s ao invés de %s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Sem entradas hash no arquivo liberado %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Linha inválida no arquivo de desvios: %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Impossível analisar arquivo de pacote %s (1)"
@@ -3178,6 +3214,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"Não foi possível localizar nenhum arquivo do pacote, talvez esse não seja um "
+"disco Debian ou a arquitetura esteja incorreta?"
#: apt-pkg/cdrom.cc:782
#, c-format
@@ -3209,22 +3247,22 @@ msgstr "Gravando nova lista de fontes\n"
msgid "Source list entries for this disc are:\n"
msgstr "Entradas na lista de fontes para este disco são:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Gravados %i registros.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Gravados %i registros com %i arquivos faltando.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Gravados %i registros com %i arquivos que não combinam\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3234,13 +3272,24 @@ msgstr ""
#: apt-pkg/indexcopy.cc:515
#, c-format
msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "Não é possível encontrar o registro de autenticação para: %s"
#: apt-pkg/indexcopy.cc:521
#, fuzzy, c-format
msgid "Hash mismatch for: %s"
msgstr "Hash Sum incorreto"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Arquivo %s não inicia com mensagem assinada simples"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abortando instalação."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3265,6 +3314,7 @@ msgstr "Impossível achar pacote %s"
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
+"Não se pode selecionar versões do pacote '%s' pois são puramente virtuais"
#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
#, c-format
@@ -3272,166 +3322,190 @@ msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
+"Não é possível selecionar ou instalar uma versão candidata do pacote '%s' "
+"porque não existe nenhum deles."
#: apt-pkg/cacheset.cc:555
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
+"Não é possível selecionar a última versão do pacote '%s' pois é simplesmente "
+"virtual."
#: apt-pkg/cacheset.cc:563
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
+"Não é possível selecionar uma versão candidata do pacote %s uma vez que não "
+"tem candidato"
#: apt-pkg/cacheset.cc:571
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
+"Não é possível selecionar a versão instalada do pacote %s pois ele não está "
+"instalado."
#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
msgid "Send scenario to solver"
-msgstr ""
+msgstr "Enviar estrutura para resolver"
#: apt-pkg/edsp.cc:209
msgid "Send request to solver"
-msgstr ""
+msgstr "Enviar requisição para resolver"
#: apt-pkg/edsp.cc:279
msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Preparando para receber solução"
#: apt-pkg/edsp.cc:286
msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "A solução externa falhou sem uma mensagem de erro adequada"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
-msgstr ""
+msgstr "Executar solução externa"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Instalando %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Configurando %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Removendo %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "%s completamente removido"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "Notado o desaparecimento de %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Executando gatilho pós-instalação %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Diretório '%s' está faltando"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Não foi possível abrir arquivo %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Preparando %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Desempacotando %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparando para configurar %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s instalado"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparando para a remoção de %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s removido"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparando para remover completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s completamente removido"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
-msgstr ""
+msgstr "Executando dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "Operação interrompida antes que pudesse terminar"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+msgstr "Nenhum relatório do apport gravado porque MaxReports já foi atingido"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "problemas de dependência - deixando desconfigurado"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
+"Nenhum relatório do apport gravado porque a mensagem de erro indica é o "
+"seguimento de um erro de uma falha anterior."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
+"Nenhum relatório do apport gravado porque a mensagem de erro indica um erro "
+"de disco cheio"
#: apt-pkg/deb/dpkgpm.cc:1496
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
+"Sem relatório apport escrito porque a mensagem de erro indicava um erro de "
+"falta de memória"
+
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nenhum relatório apport gravado porque a mensagem de erro indica um problema "
+"no sistema local"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
+"Nenhum relatório do apport escrito porque a mensagem de erro indica um erro "
+"de entrada/saída (E/S) do dpkg"
#: apt-pkg/deb/debsystem.cc:84
#, c-format
@@ -3439,6 +3513,8 @@ msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
+"Não foi possível travar o diretório da administração (%s), tem outro "
+"processo o utilizando?"
#: apt-pkg/deb/debsystem.cc:87
#, fuzzy, c-format
@@ -3452,10 +3528,20 @@ msgstr "Impossível criar trava no diretório de listas"
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr ""
+"O dpkg foi interrompido, você deve executar manualmente '%s' para corrigir o "
+"problema. "
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
-msgstr ""
+msgstr "Não bloqueado"
+
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Pronto"
#, fuzzy
#~ msgid "Skipping nonexistent file %s"
diff --git a/po/ro.po b/po/ro.po
index 1b6c6c06c..42ec2ab74 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -112,6 +112,7 @@ msgstr "Trebuie să dați exact un șablon"
#: cmdline/apt-cache.cc:1361
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
+"Această comandă este învechită. Folosiți în schimb 'apt-mark showauto'."
#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
#, c-format
@@ -158,7 +159,7 @@ msgid " Version table:"
msgstr " Tabela de versiuni:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -295,7 +296,7 @@ msgstr "Y"
#: cmdline/apt-get.cc:140
msgid "N"
-msgstr ""
+msgstr "N"
#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
#, c-format
@@ -449,7 +450,7 @@ msgstr "Pachetul %s nu are nici un candidat la instalare"
#: cmdline/apt-get.cc:725
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "Pachetele virtuale ca '%s' nu pot fi eliminate\n"
#. TRANSLATORS: Note, this is not an interactive question
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -636,7 +637,7 @@ msgstr "Renunțare."
msgid "Do you want to continue [Y/n]? "
msgstr "Vreți să continuați [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
@@ -687,7 +688,7 @@ msgstr ""
#: cmdline/apt-get.cc:1561
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Ignoră obiectivele indisponibile ale versiunii '%s' din pachetul '%s'"
#: cmdline/apt-get.cc:1593
#, fuzzy, c-format
@@ -698,7 +699,7 @@ msgstr "Nu pot determina starea listei surse de pachete %s"
#: cmdline/apt-get.cc:1631
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Ignoră versiunea indisponibilă '%s' a pachetului '%s'"
#: cmdline/apt-get.cc:1647
msgid "The update command takes no arguments"
@@ -830,12 +831,14 @@ msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
+"Această comandă este învechită. Folosiți în schimb 'apt-mark auto' și 'apt-"
+"mark manual'."
#: cmdline/apt-get.cc:2185
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Eșec"
@@ -860,7 +863,7 @@ msgstr ""
#: cmdline/apt-get.cc:2393
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "Se descarcă %s %s"
#: cmdline/apt-get.cc:2453
msgid "Must specify at least one package to fetch source for"
@@ -877,6 +880,9 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
+"NOTĂ: pachetul „%s” este menţinut în sistemul de control al versiunii „%s” "
+"la:\n"
+"%s\n"
#: cmdline/apt-get.cc:2515
#, c-format
@@ -885,6 +891,9 @@ msgid ""
"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
+"Folosiți:\n"
+"bzr branch %s\n"
+"pentru obținerea ultimelor (posibil nelansate) actualizări ale pachetului.\n"
#: cmdline/apt-get.cc:2568
#, c-format
@@ -955,6 +964,8 @@ msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"Nu este disponibilă nicio informație despre arhitectură pentru %s. Pentru "
+"configurare consultați apt.conf(5) APT::Architectures"
#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
#, c-format
@@ -1028,11 +1039,11 @@ msgstr "Eșec la prelucrarea dependențelor de compilare"
msgid "Changelog for %s (%s)"
msgstr "Conectare la %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1121,13 +1132,17 @@ msgstr ""
"pentru mai multe informații și opțiuni.\n"
" Acest APT are puterile unei Super Vaci.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"NOTĂ: Aceasta este doar o simulare!\n"
+" apt-get necesită privilegii root pentru o execuție reală.\n"
+" Rețineți de asemenea că blocarea este dezactivată,\n"
+" așa ca nu depinde relevanța situaţiei actuale reale!"
#: cmdline/acqprogress.cc:60
msgid "Hit "
@@ -1192,8 +1207,7 @@ msgid "%s was already not hold.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Așteptat %s, dar n-a fost acolo"
@@ -1210,7 +1224,7 @@ msgstr "Eșec la „open” pentru %s"
#: cmdline/apt-mark.cc:332
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Executarea dpkg a eșuat. Sunteți root?"
#: cmdline/apt-mark.cc:379
msgid ""
@@ -1331,8 +1345,8 @@ msgstr "Timpul de conectare a expirat"
msgid "Server closed the connection"
msgstr "Serverul a închis conexiunea"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Eroare de citire"
@@ -1345,8 +1359,8 @@ msgid "Protocol corruption"
msgstr "Protocol corupt"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Eroare de scriere"
@@ -1402,7 +1416,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat"
msgid "Unable to accept connection"
msgstr "Nu s-a putut accepta conexiune"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problemă la calcularea dispersiei pentru fișierul"
@@ -1429,95 +1443,90 @@ msgstr "Interogare"
msgid "Unable to invoke "
msgstr "Nu s-a putut invoca"
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Conectare la %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nu s-a putut crea un socket pentru %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nu s-a putut iniția conexiunea cu %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
"Nu s-a putut realiza conexiunea cu %s:%s (%s), timpul de conectare expirat"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Conectare la %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nu s-a putut rezolva „%s”"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Eșec temporar la rezolvarea lui „%s”"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina "
"amprenta digitale a cheii?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Eroare necunoscută în timp ce se execută gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Următoarele semnături nu au fost valide:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1527,7 +1536,7 @@ msgstr ""
#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "Fișierele goale nu pot fi arhive valide"
#: methods/http.cc:394
msgid "Waiting for headers"
@@ -1557,54 +1566,54 @@ msgstr "Acest server HTTP are un suport defect de intervale"
msgid "Unknown date format"
msgstr "Format dată necunoscut"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Selecția a eșuat"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Eroare la scrierea fișierului de rezultat"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Eroare la scrierea în fișier"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fișierul"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Eroare la citirea de la server. Conexiunea a fost închisă de la distanță"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Eroare la citirea de la server"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Conectare eșuată"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Eroare internă"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Nu s-a putut citi %s"
@@ -1622,7 +1631,7 @@ msgstr "Nu pot schimba la %s"
#: methods/mirror.cc:280
#, c-format
msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "Nu a fost găsit niciun fișier oglindă „%s” "
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
@@ -1634,7 +1643,7 @@ msgstr "Nu s-a putut deschide fișierul %s"
#: methods/mirror.cc:442
#, c-format
msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[Oglindă: %s]"
#: methods/rred.cc:491
#, c-format
@@ -1642,6 +1651,8 @@ msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
+"Nu se poate completa %s cu mmap și cu utilizarea operațiilor din fișier - "
+"patch-ul pare a fi corupt."
#: methods/rred.cc:496
#, c-format
@@ -1649,6 +1660,8 @@ msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
+"Nu se poate completa %s cu mmap (dar nu este specificată nicio eroare "
+"specifică mmap) - patch-ul pare a fi corupt."
#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
msgid "Failed to create IPC pipe to subprocess"
@@ -1726,7 +1739,7 @@ msgstr ""
" -c=? Citește acest fișier de configurare\n"
" -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Nu s-a putut scrie în %s"
@@ -1880,8 +1893,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Nu s-a putut deschide fișierul DB %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Eșec la „stat” pentru %s"
@@ -1894,87 +1907,87 @@ msgstr "Arhiva nu are înregistrare de control"
msgid "Unable to get a cursor"
msgstr "Nu s-a putut obține un cursor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "A: Nu s-a putut citi directorul %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "A: Nu s-a putut efectua „stat” pentru %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "A: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Erori la fișierul "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Eșec la „resolve” pentru %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Parcurgerea arborelui a eșuat"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Eșec la „open” pentru %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Dezlegare %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Eșec la „readlink” pentru %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Eșec la „unlink” pentru %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Eșec la „link” între %s și %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Arhiva nu are câmp de pachet"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nu are intrare de înlocuire\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nu are nici o intrare sursă de înlocuire\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nu are nici intrare binară de înlocuire\n"
@@ -2048,7 +2061,7 @@ msgstr "Eșec la citire în timpul calculului sumei MD5"
msgid "Problem unlinking %s"
msgstr "Problemă la desfacerea %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Eșec la redenumirea lui %s în %s"
@@ -2196,55 +2209,55 @@ msgstr "Eșec la scrierea fișierului %s"
msgid "Failed to close file %s"
msgstr "Eșec la închiderea fișierului %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Calea %s este prea lungă"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Se despachetează %s de mai multe ori"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Directorul %s este redirectat"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Pachetul încearcă să scrie în ținta redirectării %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Calea de redirectare este prea lungă"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Directorul %s este înlocuit de un non-director"
# XXX: nu-mi place, hash bucket ar trebui tradus mai elegant
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Eșec la localizarea nodului în clasa lui din tabela de dispersie"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Calea este prea lungă"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Pachet suprascris fără nici o versiune pentru %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Nu se poate executa „stat” pe %s"
@@ -2317,37 +2330,41 @@ msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
+"Nu s-a putut mări dimensiunea MMap pentru că limita de %lu de octeți e deja "
+"atinsă."
#: apt-pkg/contrib/mmap.cc:443
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
+"Nu s-a putut mări dimensiunea MMap pentru că redimensionarea automată a fost "
+"dezactivată de utilizator."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Selecția %s nu a fost găsită"
@@ -2419,16 +2436,6 @@ msgstr "%c%s... Eroare!"
msgid "%c%s... Done"
msgstr "%c%s... Terminat"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Terminat"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2513,23 +2520,24 @@ msgstr "Nu pot determina blocajul %s"
#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "Nu se poate crea lista de fișiere pentru că '%s' nu e un director"
#: apt-pkg/contrib/fileutl.cc:426
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "Se ignoră '%s' în directorul '%s' pentru că nu e fișier obișnuit"
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgstr "Se ignoră fișierul '%s' din directorul '%s' pentru că nu are extensie"
#: apt-pkg/contrib/fileutl.cc:453
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
+"Se ignoră fișierul '%s' din directorul '%s' pentru că are extensie nevalidă"
#: apt-pkg/contrib/fileutl.cc:840
#, c-format
@@ -2541,69 +2549,63 @@ msgstr "Subprocesul %s a primit o eroare de segmentare."
msgid "Sub-process %s received signal %u."
msgstr "Subprocesul %s a primit o eroare de segmentare."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subprocesul %s a întors un cod de eroare (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subprocesul %s s-a terminat brusc"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Nu s-a putut deschide fișierul %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Nu s-a putut deschide conexiunea pentru %s"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Eșec la crearea IPC-ului pentru subproces"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Eșec la executarea compresorului"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "scriere, încă mai am %lu de scris dar nu pot"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Problemă la închiderea fișierului"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problemă în timpul sincronizării fișierului"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Problemă la dezlegarea fișierului"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problemă în timpul sincronizării fișierului"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Abandonez instalarea."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Cache gol de pachet"
@@ -2630,59 +2632,59 @@ msgstr "Acest APT nu suportă versioning system '%s'"
msgid "The package cache was built for a different architecture"
msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Depinde"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Pre-depinde"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Sugerează"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Recomandă"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Este în conflict"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Înlocuiește"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Învechit"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Corupe"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
-msgstr ""
+msgstr "Îmbunătățește"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "important"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "cerut"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "opțional"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2782,12 +2784,12 @@ msgstr "Deschidere %s"
msgid "Line %u too long in source list %s."
msgstr "Linia %u prea lungă în lista sursă %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Linie greșită %u în lista sursă %s (tip)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
@@ -2798,6 +2800,8 @@ msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Nu se poate realiza o configurare imediată pentru „%s”. Pentru mai multe "
+"detalii consultați man 5 apt.conf din APT::Immediate-Configure. (%d)"
#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504
#, fuzzy, c-format
@@ -2828,7 +2832,7 @@ msgid ""
msgstr ""
"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2836,11 +2840,11 @@ msgstr ""
"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
"cauzată de pachete ținute."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2892,12 +2896,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Vă rog introduceți discul numit: '%s' în unitatea '%s' și apăsați Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistemul de pachete '%s' nu este suportat"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nu s-a putut determina un tip de sistem de împachetare potrivit"
@@ -2931,6 +2935,8 @@ msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"Valoarea „%s” nu este una validă pentru APT::Default-Release, întrucât o "
+"astfel de versiune nu este disponibilă în surse."
#: apt-pkg/policy.cc:399
#, fuzzy, c-format
@@ -2953,14 +2959,14 @@ msgstr "Cache are un versioning system incompatibil"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
@@ -2986,27 +2992,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Mamăăă, ați depășit numărul de dependențe de care este capabil acest APT."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nu pot determina starea listei surse de pachete %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Citire liste de pachete"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Colectare furnizori fișier"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Eroare IO în timpul salvării sursei cache"
@@ -3019,55 +3025,61 @@ msgstr "redenumire eșuată, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Nepotrivire la suma de căutare"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"Nu se poate găsi intrarea așteptată „%s” în fișierul Release (intrare "
+"greșită în sources.list sau linie coruptă)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"Fișierul Release pentru %s este expirat (nevalid de %s). Actualizările "
+"pentru acest depozit nu vor fi aplicate."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "Distribuție în conflict: %s (se aștepta %s dar s-a primit %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
+"A apărut o eroare la verificarea semnăturii. Depozitul de programe nu este "
+"actualizat, așa că va fi utilizat indexul precedent. Eroare GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "Eroare GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3076,7 +3088,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:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3085,7 +3097,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:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3093,31 +3105,31 @@ msgstr ""
"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
"pachetul %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Notă, se selectează %s în locul lui %s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Nicio sumă de control în fișierul Release %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
@@ -3185,6 +3197,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"Nu se pot localiza niciun fișier pachet, este posibil ca acest disc să nu "
+"fie un disc Debian sau să aveți o arhitectură greșită?"
#: apt-pkg/cdrom.cc:782
#, c-format
@@ -3216,22 +3230,22 @@ msgstr "Scriere noua listă sursă\n"
msgid "Source list entries for this disc are:\n"
msgstr "Intrările listei surselor pentru acest disc sunt:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "S-au scris %i înregistrări.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "S-au scris %i înregistrări cu %i fișiere lipsă.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "S-au scris %i înregistrări cu %i fișiere nepotrivite\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3240,13 +3254,24 @@ msgstr ""
#: apt-pkg/indexcopy.cc:515
#, c-format
msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "Nu se poate găsi înregistrarea de autentificare pentru: %s"
#: apt-pkg/indexcopy.cc:521
#, fuzzy, c-format
msgid "Hash mismatch for: %s"
msgstr "Nepotrivire la suma de căutare"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Fișierul %s nu pornește cu un mesaj semnat clar"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Abandonez instalarea."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3271,6 +3296,7 @@ msgstr "Nu pot găsi pachetul %s"
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
+"Nu se pot selecta versiunile din pachetul „%s” deoarece este unul pur virtual"
#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
#, c-format
@@ -3278,167 +3304,192 @@ msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
+"Nu se poate selecta nicio versiune instalată sau candidat din pachetul „%s” "
+"deoarece nu conține astfel de fișere"
#: apt-pkg/cacheset.cc:555
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
+"Nu se poate selecta o versiune mai nouă din pachetul „%s” deoarece este unul "
+"pur virtual"
#: apt-pkg/cacheset.cc:563
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
+"Nu se poate selecta versiunea candidat din pachetul %s deoarece nu conține "
+"niciun candidat"
#: apt-pkg/cacheset.cc:571
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
+"Nu se poate selecta versiunea instalată din pachetul %s deoarece nu este "
+"instalat"
#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
msgid "Send scenario to solver"
-msgstr ""
+msgstr "Trimite scenariul la rezolvator"
#: apt-pkg/edsp.cc:209
msgid "Send request to solver"
-msgstr ""
+msgstr "Trimite cererea la rezolvator"
#: apt-pkg/edsp.cc:279
msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Se pregătește pentru primirea soluției"
#: apt-pkg/edsp.cc:286
msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "Rezolvatorul extern a eșuat fără un mesaj de eroare potrivit"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
-msgstr ""
+msgstr "Execută rezolvatorul extern"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Se instalează %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Se configurează %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Se șterge %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Șters complet %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "Se ia notă de dispariția lui %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Se rulează declanșatorul post-instalare %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Directorul „%s” lipsește."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Nu s-a putut deschide fișierul %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Se pregătește %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Se despachetează %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Se pregătește configurarea %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Instalat %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Se pregătește ștergerea lui %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Șters %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Se pregătește ștergerea completă a %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Șters complet %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
-msgstr ""
+msgstr "Se pornește dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "Operația a fost întreruptă înainte de a fi terminată"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
+"Nu există un raport apport deoarece limita MaxReports a fost deja atinsă"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "probleme de dependențe - se lasă neconfigurat"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
+"Nu a fost scris niciun raport apport deoarece mesajul de eroare indică o "
+"eroare survenită în urma unei erori precedente."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
+"Nu a fost scris niciun raport apport deoarece mesajul de eroare indică o "
+"eroare referitoare la disc plin"
#: apt-pkg/deb/dpkgpm.cc:1496
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
+"Nu a fost scris niciun raport apport deoarece mesajul de eroare indică o "
+"eroare referitoare la memorie insuficientă"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nu a fost scris niciun raport apport deoarece mesajul de eroare indică o "
+"eroare referitoare la o problemă de pe sistemul local"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
+"Nu a fost scris niciun raport apport deoarece mesajul de eroare indică o "
+"eroare I/O dpkg"
#: apt-pkg/deb/debsystem.cc:84
#, c-format
@@ -3446,6 +3497,8 @@ msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
+"Nu se poate bloca dosarul de administrare (%s), este oare utilizat de un alt "
+"proces?"
#: apt-pkg/deb/debsystem.cc:87
#, fuzzy, c-format
@@ -3459,10 +3512,20 @@ msgstr "Nu pot încuia directorul cu lista"
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr ""
+"dpkg a fost întrerupt, pentru a corecta problema trebuie să rulați manual "
+"„%s”. "
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
-msgstr ""
+msgstr "Nu este blocat"
+
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Terminat"
#, fuzzy
#~ msgid "Skipping nonexistent file %s"
diff --git a/po/ru.po b/po/ru.po
index 7ebebbd7f..b94da0a46 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt rev2227.1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-06-30 08:47+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -162,7 +162,7 @@ msgid " Version table:"
msgstr " Таблица версий:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -647,7 +647,7 @@ msgstr "Аварийное завершение."
msgid "Do you want to continue [Y/n]? "
msgstr "Хотите продолжить [Д/н]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не удалось получить %s %s\n"
@@ -846,7 +846,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Расчёт обновлений…"
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Неудачно"
@@ -1046,11 +1046,11 @@ msgstr "Обработка зависимостей для сборки заве
msgid "Changelog for %s (%s)"
msgstr "Changelog для %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1142,7 +1142,7 @@ msgstr ""
"содержится подробная информация и описание параметров.\n"
" В APT есть коровья СУПЕРСИЛА.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1217,8 +1217,7 @@ msgid "%s was already not hold.\n"
msgstr "%s уже помечен как не зафиксированный.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
@@ -1380,8 +1379,8 @@ msgstr "Допустимое время ожидания для соединен
msgid "Server closed the connection"
msgstr "Сервер прервал соединение"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Ошибка чтения"
@@ -1394,8 +1393,8 @@ msgid "Protocol corruption"
msgstr "Искажение протокола"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Ошибка записи"
@@ -1451,7 +1450,7 @@ msgstr "Время установления соединения для соке
msgid "Unable to accept connection"
msgstr "Невозможно принять соединение"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Проблема при хешировании файла"
@@ -1478,92 +1477,87 @@ msgstr "Запрос"
msgid "Unable to invoke "
msgstr "Невозможно вызвать "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Соединение с %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Невозможно инициализировать соединение с %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Не удаётся соединиться с %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Соединение с %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Не удалось найти IP-адрес для «%s»"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Временная ошибка при попытке получить IP-адрес «%s»"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Невозможно соединиться с %s: %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
"ключа?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Найдена как минимум одна неправильная подпись."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Не удалось выполнить «gpgv» для проверки подписи (gpgv установлена?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Неизвестная ошибка при выполнении gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Следующие подписи неверные:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1603,53 +1597,53 @@ msgstr "Этот HTTP-сервер не поддерживает скачива
msgid "Unknown date format"
msgstr "Неизвестный формат данных"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Время ожидания для соединения истекло"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Ошибка записи в выходной файл"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтения, удалённый сервер прервал соединение"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Внутренняя ошибка"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Невозможно прочитать %s"
@@ -1773,7 +1767,7 @@ msgstr ""
" -c=? Читать указанный файл настройки\n"
" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Невозможно записать в %s"
@@ -1925,8 +1919,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Не удалось открыть DB файл %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Не удалось получить атрибуты %s"
@@ -1939,87 +1933,87 @@ msgstr "В архиве нет поля control"
msgid "Unable to get a cursor"
msgstr "Невозможно получить курсор"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Не удалось прочитать каталог %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Не удалось прочитать атрибуты %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Ошибки относятся к файлу "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Не удалось проследовать по ссылке %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Не удалось совершить обход дерева"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Не удалось открыть %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Не удалось прочесть ссылку %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Не удалось удалить %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Не удалось создать ссылку %s на %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Превышен лимит в %sB в DeLink.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "В архиве нет поля package"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " Нет записи о переназначении (override) для %s\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакет %s сопровождает %s, а не %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " Нет записи source override для %s\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " Нет записи binary override для %s\n"
@@ -2094,7 +2088,7 @@ msgstr "Ошибка чтения во время вычисления MD5"
msgid "Problem unlinking %s"
msgstr "Не удалось удалить %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Не удалось переименовать %s в %s"
@@ -2239,54 +2233,54 @@ msgstr "Не удалось записать в файл %s"
msgid "Failed to close file %s"
msgstr "Не удалось закрыть файл %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Слишком длинный путь %s"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Повторная распаковка %s"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Каталог %s входит в список diverted"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Пакет пытается писать в diversion %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Путь diversion слишком длинен"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Каталог %s был заменён не-каталогом"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Не удалось разместить узел в хеше"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Путь слишком длинен"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Файлы заменяются содержимым пакета %s без версии"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Файл %s/%s переписывает файл в пакете %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Невозможно получить атрибуты %s"
@@ -2368,30 +2362,30 @@ msgstr ""
"отключено пользователем."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liд %liч %liмин %liс"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%liч %liмин %liс"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%liмин %liс"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Не найдено: %s"
@@ -2465,16 +2459,6 @@ msgstr "%c%s… Ошибка!"
msgid "%c%s... Done"
msgstr "%c%s… Готово"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr "…"
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s… %u%%"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2593,70 +2577,64 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr "Порождённый процесс %s получил сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Порождённый процесс %s вернул код ошибки (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Порождённый процесс %s неожиданно завершился"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Не удалось открыть файл %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Не удалось открыть файловый дескриптор %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Не удалось создать IPC с порождённым процессом"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Не удалось выполнить компрессор "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr ""
"ошибка при чтении; собирались прочесть ещё %llu байт, но ничего больше нет"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "ошибка при записи; собирались записать ещё %llu байт, но не смогли"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Проблема закрытия файла %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Проблема при переименовании файла %s в %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Проблема при удалении файла %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Проблема при синхронизации файла"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Связка ключей в %s не установлена."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Кэш пакетов пуст"
@@ -2682,59 +2660,59 @@ msgstr "Эта версия APT не поддерживает систему в
msgid "The package cache was built for a different architecture"
msgstr "Кэш пакетов был собран для другой архитектуры"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Зависит"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "ПредЗависит"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Предлагает"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Рекомендует"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Конфликтует"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Заменяет"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Замещает"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Ломает"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Улучшает"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "важный"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "необходимый"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "стандартный"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "необязательный"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "дополнительный"
@@ -2838,12 +2816,12 @@ msgstr "Открытие %s"
msgid "Line %u too long in source list %s."
msgstr "Строка %u в списке источников %s слишком длинна."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Искажённая строка %u в списке источников %s (тип)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
@@ -2887,7 +2865,7 @@ msgid ""
msgstr ""
"Пакет %s нуждается в переустановке, но найти архив для него не удалось."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2895,11 +2873,11 @@ msgstr ""
"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
"может быть вызвано отложенными (held) пакетами."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2949,12 +2927,12 @@ msgstr "Метод %s запустился не корректно"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Система пакетирования «%s» не поддерживается"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Невозможно определить подходящий тип системы пакетирования"
@@ -3009,14 +2987,14 @@ msgstr "Кэш имеет несовместимую систему версий
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Произошла ошибка во время обработки %s (%s%d)"
@@ -3043,26 +3021,26 @@ msgstr ""
"Превышено допустимое количество зависимостей, которое способен обработать "
"APT."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Чтение списков пакетов"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Сбор информации о Provides"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
@@ -3075,12 +3053,12 @@ msgstr "переименовать не удалось, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Хеш сумма не совпадает"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3089,16 +3067,16 @@ msgstr ""
"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
"в sources.list или файл)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3107,27 +3085,27 @@ msgstr ""
"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
"репозитория производиться не будет."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут "
"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Ошибка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3136,7 +3114,7 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3145,37 +3123,37 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Не совпадает размер"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Невозможно разобрать содержимое файла Release (%s)"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Отсутствуют разделы в файле Release (%s)"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Отсутствуют элементы Hash в файле Release (%s)"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Неправильный элемент «Date» в файле Release %s"
@@ -3275,22 +3253,22 @@ msgstr "Запись нового списка источников\n"
msgid "Source list entries for this disc are:\n"
msgstr "Записи в списке источников для этого диска:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Сохранено %i записей.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Сохранено %i записей с %i отсутствующими файлами.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Сохранено %i записей с %i несовпадающими файлами\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3307,6 +3285,17 @@ msgstr "Не удалось найти аутентификационную за
msgid "Hash mismatch for: %s"
msgstr "Не совпадает хеш сумма для: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Связка ключей в %s не установлена."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3379,115 +3368,115 @@ msgstr "Подготовка к приёму решения"
msgid "External solver failed without a proper error message"
msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Запустить внешний решатель"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Устанавливается %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Настраивается %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Удаляется %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Выполняется полное удаление %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Уведомление об исчезновении %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Выполняется послеустановочный триггер %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Отсутствует каталог «%s»"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Не удалось открыть файл «%s»"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Подготавливается %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Распаковывается %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Подготавливается для настройки %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Установлен %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Подготавливается для удаления %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Удалён %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Подготовка к полному удалению %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s полностью удалён"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не "
"смонтирован?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Запускается dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Действие прервано до его завершения"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "Отчёты apport не записаны, так достигнут MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "проблемы с зависимостями — оставляем ненастроенным"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3495,7 +3484,7 @@ msgstr ""
"Отчёты apport не записаны, так как сообщение об ошибке указывает на "
"повторную ошибку от предыдущего отказа."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3511,7 +3500,15 @@ msgstr ""
"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
"памяти"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Отчёт apport не создан, так как сообщение об ошибке свидетельствует о "
+"неисправности в локальной системе."
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3548,8 +3545,22 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблокирован"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)"
+
+#~ msgid "..."
+#~ msgstr "…"
+
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s… %u%%"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут "
+#~ "использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Пропускается несуществующий файл %s"
diff --git a/po/sk.po b/po/sk.po
index 90392e27c..bda938320 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-06-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -158,7 +158,7 @@ msgid " Version table:"
msgstr " Tabuľka verzií:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -633,7 +633,7 @@ msgstr "Prerušené."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovať [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
@@ -835,7 +835,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Chyba"
@@ -1032,11 +1032,11 @@ msgstr "Spracovanie závislostí na zostavenie zlyhalo"
msgid "Changelog for %s (%s)"
msgstr "Záznam zmien %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1124,7 +1124,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tento APT má schopnosti posvätnej kravy.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1199,8 +1199,7 @@ msgid "%s was already not hold.\n"
msgstr "%s bol už nastavený na nepodržanie.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čakalo sa na %s, ale nebolo to tam"
@@ -1357,8 +1356,8 @@ msgstr "Uplynul čas spojenia"
msgid "Server closed the connection"
msgstr "Server ukončil spojenie"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Chyba pri čítaní"
@@ -1371,8 +1370,8 @@ msgid "Protocol corruption"
msgstr "Narušenie protokolu"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Chyba pri zápise"
@@ -1426,7 +1425,7 @@ msgstr "Uplynulo spojenie dátového socketu"
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problém s hašovaním súboru"
@@ -1453,90 +1452,85 @@ msgstr "Dotaz"
msgid "Unable to invoke "
msgstr "Nedá sa vyvolať "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Pripája sa k %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Nedá sa pripojiť k %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Pripája sa k %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Nie je možné preložiť „%s“"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Dočasné zlyhanie pri preklade „%s“"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Nedá sa pripojiť k %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Bola zistená aspoň jedna nesprávna signatúra."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Neznáma chyba pri spustení gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Nasledovné signatúry sú neplatné:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1576,53 +1570,53 @@ msgstr "Tento HTTP server má poškodenú podporu rozsahov"
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Chyba zápisu do tohto súboru"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Vnútorná chyba"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Nedá sa načítať %s"
@@ -1745,7 +1739,7 @@ msgstr ""
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Do %s sa nedá zapisovať"
@@ -1890,8 +1884,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Nedá sa otvoriť DB súbor %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "%s sa nedá vyhodnotiť"
@@ -1904,87 +1898,87 @@ msgstr "Archív nemá riadiaci záznam"
msgid "Unable to get a cursor"
msgstr "Nedá sa získať kurzor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Adresár %s sa nedá čítať\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: %s sa nedá vyhodnotiť\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Chyby sa týkajú súboru "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Chyba pri preklade %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Prechod stromom zlyhal"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "%s sa nedá otvoriť"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Odlinkovanie %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Nie je možné vykonať readlink %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Nie je možné vykonať unlink %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Nepodarilo sa zlinkovať %s s %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole „package“"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žiadnu položku override\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žiadnu položku „source override“\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá žiadnu položku „binary override“\n"
@@ -2058,7 +2052,7 @@ msgstr "Chyba čítania pri výpočte MD5"
msgid "Problem unlinking %s"
msgstr "Problém s odlinkovaním %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Premenovanie %s na %s zlyhalo"
@@ -2202,54 +2196,54 @@ msgstr "Zápis súboru %s zlyhal"
msgid "Failed to close file %s"
msgstr "Zatvorenie súboru %s zlyhalo"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Cesta %s je príliš dlhá"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s sa rozbaľuje viackrát"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Adresár %s je divertovaný"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Diverzná cesta je príliš dlhá"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Adresár %s sa nahradí neadresárom"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Nedá sa nájsť uzol na adrese jeho hašu"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Cesta je príliš dlhá"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Súbor %s/%s prepisuje ten z balíka %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Nedá sa vyhodnotiť %s"
@@ -2330,30 +2324,30 @@ msgstr ""
"používateľ."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li d %li h %li min %li s"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%li h %li min %li s"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%li min %li s"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%li s"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Voľba %s nenájdená"
@@ -2425,16 +2419,6 @@ msgstr "%c%s... Chyba!"
msgid "%c%s... Done"
msgstr "%c%s... Hotovo"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Hotovo"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2547,69 +2531,63 @@ msgstr "Podproces %s obdržal chybu segmentácie."
msgid "Sub-process %s received signal %u."
msgstr "Podproces %s dostal signál %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Podproces %s vrátil chybový kód (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočakávane skončil"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Nedá sa otvoriť súbor %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Nedá sa otvoriť popisovač súboru %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Nedá sa vytvoriť podproces IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Nepodarilo sa spustiť kompresor "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "čítanie, treba prečítať ešte %llu, ale už nič neostáva"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "zápis, treba zapísať ešte %llu, no nedá sa to"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problém pri zatváraní súboru %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problém pri synchronizovaní súboru %s na %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problém pri odstraňovaní súboru %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problém pri synchronizovaní súboru"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Vyrovnávacia pamäť balíkov je prázdna"
@@ -2635,59 +2613,59 @@ msgstr "Tento APT nepodporuje systém na správu verzií „%s“"
msgid "The package cache was built for a different architecture"
msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Závisí na"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Predzávisí na"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Navrhuje"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Odporúča"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Koliduje s"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Nahrádza"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Zneplatňuje"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Kazí"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Rozširuje"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "dôležitý"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "požadovaný"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "štandardný"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "voliteľný"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2788,12 +2766,12 @@ msgstr "Otvára sa %s"
msgid "Line %u too long in source list %s."
msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
@@ -2834,7 +2812,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 nedá sa nájsť jeho archív."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2842,11 +2820,11 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
"pridržanými balíkmi."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
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."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2896,12 +2874,12 @@ msgstr "Spôsob %s nebol správne spustený"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Systém balíkov „%s“ nie je podporovaný"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Nedá sa určiť vhodný typ systému balíkov"
@@ -2956,14 +2934,14 @@ msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
@@ -2986,26 +2964,26 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Načítavajú sa zoznamy balíkov"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Collecting File poskytuje"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
@@ -3018,12 +2996,12 @@ msgstr "premenovanie zlyhalo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Nezhoda kontrolných MD5 súčtov"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Nezhoda kontrolných haš súčtov"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3032,16 +3010,16 @@ msgstr ""
"Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna "
"položka sources.list alebo chybný formát súboru)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3050,27 +3028,27 @@ msgstr ""
"Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja "
"softvéru sa nepoužijú."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Počas overovania podpisu sa vyskytla chyba. Repozitár nie je aktualizovaný a "
"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3079,7 +3057,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:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3088,37 +3066,37 @@ 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:1759
+#: apt-pkg/acquire-item.cc:1764
#, 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:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Nedá spracovať súbor Release %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Žiadne sekcie v Release súbore %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Chýba položka „Hash“ v súbore Release %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Chýba položka „Date“ v súbore Release %s"
@@ -3218,22 +3196,22 @@ msgstr "Zapisuje sa nový zoznam zdrojov\n"
msgid "Source list entries for this disc are:\n"
msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapísaných %i záznamov.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
@@ -3248,6 +3226,17 @@ msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
msgid "Hash mismatch for: %s"
msgstr "Nezhoda kontrolných haš súčtov: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3318,115 +3307,115 @@ msgstr "Pripraviť sa na prijatie riešenia"
msgid "External solver failed without a proper error message"
msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Spustiť externého riešiteľa"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Inštaluje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Nastavuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Odstraňuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Úplne sa odstraňuje %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Zaznamenali sme zmiznutie %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Vykonáva sa spúšťač post-installation %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Adresár „%s“ chýba"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Nedá sa otvoriť súbor „%s“"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Pripravuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaľuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Pripravuje sa nastavenie %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Nainštalovaný balík %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Pripravuje sa odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Odstránený balík %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Pripravuje sa úplné odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Balík „%s“ je úplne odstránený"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
"pripojený?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Spúšťa sa dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3434,7 +3423,7 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
"nadväznosti na predošlé zlyhanie."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3450,7 +3439,13 @@ msgstr ""
"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
"pamäte"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3480,8 +3475,20 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s
msgid "Not locked"
msgstr "Nie je zamknuté"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Hotovo"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Počas overovania podpisu sa vyskytla chyba. Repozitár nie je "
+#~ "aktualizovaný a použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Preskakuje sa neexistujúci súbor %s"
diff --git a/po/sl.po b/po/sl.po
index 2d92369d7..2ab683a72 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-06-27 21:29+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " Preglednica različic:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -630,7 +630,7 @@ msgstr "Prekini."
msgid "Do you want to continue [Y/n]? "
msgstr "Ali želite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoče dobiti %s %s\n"
@@ -836,7 +836,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Preračunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Spodletelo"
@@ -1032,11 +1032,11 @@ msgstr "Obdelava odvisnosti za gradnjo je spodletela"
msgid "Changelog for %s (%s)"
msgstr "Dnevnik sprememb za %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1123,7 +1123,7 @@ msgstr ""
" sources.list(5) in apt.conf(5). \n"
" Ta APT ima moči super krav.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1198,8 +1198,7 @@ msgid "%s was already not hold.\n"
msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Program je čakal na %s a ga ni bilo tam"
@@ -1355,8 +1354,8 @@ msgstr "Povezava je zakasnela"
msgid "Server closed the connection"
msgstr "Strežnik je zaprl povezavo"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Napaka branja"
@@ -1369,8 +1368,8 @@ msgid "Protocol corruption"
msgstr "Okvara protokola"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Napaka pisanja"
@@ -1424,7 +1423,7 @@ msgstr "Povezava podatkovne vtičnice je zakasnela"
msgid "Unable to accept connection"
msgstr "Ni mogoče sprejeti povezave"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Težava med razprševanjem datoteke"
@@ -1451,91 +1450,86 @@ msgstr "Poizvedba"
msgid "Unable to invoke "
msgstr "Ni mogoče klicati "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Povezovanje z %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Ni mogoče ustvariti vtiča za %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ni mogoče začeti povezave z %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Ni se mogoče povezati z %s:%s (%s). Povezava je zakasnela."
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Ni se mogoče povezati z %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Povezovanje z %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Ni mogoče razrešiti '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Začasna napaka med razreševanjem '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Ni se mogoče povezati z %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Najden je bil vsaj en neveljaven podpis."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Ni mogoče izvesti 'gpgv' za preverjanje podpisa (je gpgv nameščen?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Neznana napaka med izvajanjem gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Naslednji podpisi so bili neveljavni:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1574,53 +1568,53 @@ msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore"
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Povezava je zakasnela"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Napaka med pisanjem v izhodno datoteko"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Napaka med pisanjem v datoteko"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Napaka med pisanjem v datoteko"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Napaka med branjem s strežnika"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Napačni podatki glave"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Notranja napaka"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Ni mogoče brati %s"
@@ -1744,7 +1738,7 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Ni mogoče pisati na %s"
@@ -1889,8 +1883,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Ni mogoče odprti datoteke PZ %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Napaka med določitvijo %s"
@@ -1903,87 +1897,87 @@ msgstr "Arhiv nima nadzornega zapisa"
msgid "Unable to get a cursor"
msgstr "Ni mogoče najti kazalke"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "O: ni mogoče brati mape %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "O: Ni mogoče določiti %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "O: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "N: Napake se sklicujejo na datoteko "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Ni mogoče razrešiti %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Hoja drevesa je spodletela"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Ni mogoče odprti %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " RazVeži %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Napaka med branjem povezave %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Napaka med odvezovanjem %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Napaka med povezovanjem %s in %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Dosežena meja RazVezovanja %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Arhiv ni imel polja s paketom"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nima prepisanega vnosa\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Vzdrževalec %s je %s in ne %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nima izvornega vnosa prepisa\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nima tudi binarnega vnosa prepisa\n"
@@ -2057,7 +2051,7 @@ msgstr "Med računanjem MD5 ni mogoče brati"
msgid "Problem unlinking %s"
msgstr "Napaka med odvezovanjem %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Ni mogoče preimenovati %s v %s"
@@ -2203,54 +2197,54 @@ msgstr "Zapisovanje datoteke %s je spodletelo"
msgid "Failed to close file %s"
msgstr "Napaka med zapiranjem datoteke %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Pot %s je predolga"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Odpakiranje %s več kot enkrat"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Mapa %s je odklonjena"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Paket poskuša pisati v tarčo odklona %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Pot odklona je predloga"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Mapa %s je bil zamenjana z ne-mapo"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Iskanje vozlišča v njegovem razpršenem vedru ni uspelo"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Pot je predolga"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Prepiši zadetek paketa brez vnosa različice za %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Ni mogoče določiti %s"
@@ -2330,30 +2324,30 @@ msgstr ""
"Ni mogoče povečati velikosti MMap, ker je samodejno povečevanje onemogočeno."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Izbire %s ni mogoče najti"
@@ -2425,16 +2419,6 @@ msgstr "%c%s ... Napaka!"
msgid "%c%s... Done"
msgstr "%c%s ... Narejeno"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s ... Narejeno"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2547,69 +2531,63 @@ msgstr "Pod-opravilo %s je prejelo segmentacijsko napako."
msgid "Sub-process %s received signal %u."
msgstr "Pod-opravilo %s je prejelo signal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Pod-opravilo %s je vrnilo kodo napake (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Pod-opravilo %s se je nepričakovano zaključilo"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Ni mogoče odpreti datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Ni mogoče odpreti opisnika datotek %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Ni mogoče ustvariti podopravila IPD"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Ni mogoče izvesti stiskanja "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "Prebrano, še vedno je treba prebrati %llu bajtov, vendar ni nič ostalo"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "pisanje, preostalo je še %llu za pisanje, vendar ni bilo mogoče pisati"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Težava med zapiranjem datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Težava med preimenovanje datoteke %s v %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Težava med razvezovanjem datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Težava med usklajevanjem datoteke"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s ni nameščenih zbirk ključev."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Prazen predpomnilnik paketov"
@@ -2635,59 +2613,59 @@ msgstr "Ta APT ne podpira sistema različic '%s'"
msgid "The package cache was built for a different architecture"
msgstr "Predpomnilnik paketov je bil izgrajen za drugačno arhitekturo"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Odvisen od"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Predodvisen od"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Priporoča"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Priporoča"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "V sporu z"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Zamenja"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Zastara"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Pokvari"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Izboljša"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "pomembno"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "obvezno"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "običajni"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "izbirno"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "dodatno"
@@ -2793,12 +2771,12 @@ msgstr "Odpiranje %s"
msgid "Line %u too long in source list %s."
msgstr "Vrstica %u v seznamu virov %s je predolga."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
@@ -2839,7 +2817,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2847,11 +2825,11 @@ msgstr ""
"Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda "
"povzročili zadržani paketi."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2901,12 +2879,12 @@ msgstr "Način %s se ni začel pravilno"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketni sistem '%s' ni podprt"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni mogoče določiti ustrezne vrste paketnega sistema"
@@ -2961,14 +2939,14 @@ msgstr "Predpomnilnik ima neustrezen sistem različic"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)"
@@ -2989,26 +2967,26 @@ msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Paketa %s %s ni bilo mogoče najti med obdelavo odvisnosti datotek"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Ni mogoče določiti seznama izvornih paketov %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Branje seznama paketov"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Zbiranje dobaviteljev datotek"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
@@ -3021,12 +2999,12 @@ msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Neujemanje vsote razpršil"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3035,16 +3013,16 @@ msgstr ""
"Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos "
"sources.list ali slabo oblikovana datoteka)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3053,27 +3031,27 @@ msgstr ""
"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
"skladišče ne bo uveljavljena."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno "
"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Napaka GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3082,7 +3060,7 @@ msgstr ""
"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
"popraviti ta paket (zaradi manjkajočega arhiva)."
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3091,7 +3069,7 @@ msgstr ""
"Ni bilo mogoče najti datoteke za paket %s. Morda boste morali ročno "
"popraviti ta paket."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3099,31 +3077,31 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
"%s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni mogoče razčleniti Release datoteke %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Ni izbir v Release datoteki %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ni vnosa razpršila v Release datoteki %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
@@ -3223,22 +3201,22 @@ msgstr "Pisanje novega seznama virov\n"
msgid "Source list entries for this disc are:\n"
msgstr "Izvorni vnosi za ta disk so:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Zapisanih je bilo %i zapisov.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Zapisanih je bilo %i zapisov z %i manjkajočimi datotekami.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Zapisanih je bilo %i zapisov z %i neujemajočimi datotekami.\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3255,6 +3233,17 @@ msgstr "Ni mogoče najti zapisa overitve za: %s"
msgid "Hash mismatch for: %s"
msgstr "Neujemanje razpršila za: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s ni nameščenih zbirk ključev."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3322,116 +3311,116 @@ msgstr "Priprava za rešitev prejemanja"
msgid "External solver failed without a proper error message"
msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Izvedi zunanji reševalnik"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Nameščanje %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Nastavljanje %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Odstranjevanje %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "%s je bil popolnoma odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "%s je izginil"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Poganjanje sprožilca po namestitvi %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Mapa '%s' manjka"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Ni mogoče odpreti datoteke '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Pripravljanje %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Razširjanje %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Pripravljanje na nastavljanje %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "%s je bil nameščen"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Pripravljanje na odstranitev %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "%s je bil odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Pripravljanje na popolno odstranitev %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "%s je bil popolnoma odstranjen"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Ni mogoče pisati dnevnika, openpty() je spodletelo (/dev/pts ni "
"prklopljen?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Poganjanje dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "težave odvisnosti - puščanje nenastavljenega"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3439,7 +3428,7 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na "
"navezujočo napako iz predhodne napake."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3455,7 +3444,15 @@ msgstr ""
"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
"zaradi pomanjkanja pomnilnika"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo "
+"na krajevnem sistemu"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3487,8 +3484,21 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
msgid "Not locked"
msgstr "Ni zaklenjeno"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s ... Narejeno"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo "
+#~ "posodobljeno zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: "
+#~ "%s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Preskok neobstoječe datoteke %s"
@@ -3568,13 +3578,6 @@ msgstr "Ni zaklenjeno"
#~ msgid "Got a single header line over %u chars"
#~ msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#~ msgid ""
-#~ "No apport report written because the error message indicates an issue on "
-#~ "the local system"
-#~ msgstr ""
-#~ "Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na "
-#~ "težavo na krajevnem sistemu"
-
#~ msgid "Malformed override %s line %lu #1"
#~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #1"
diff --git a/po/sv.po b/po/sv.po
index 5f22dc4f6..c724c1d86 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2010-08-24 21:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -110,7 +110,7 @@ msgstr "Du måste ange minst ett sökmönster"
#: cmdline/apt-cache.cc:1361
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "Detta kommando är föråldrat. Använd \"apt-mark showauto\" istället."
#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
#, c-format
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " Versionstabell:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -292,7 +292,7 @@ msgstr "J"
#: cmdline/apt-get.cc:140
msgid "N"
-msgstr ""
+msgstr "N"
#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
#, c-format
@@ -637,7 +637,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortsätta [J/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
@@ -826,12 +826,14 @@ msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
+"Detta kommando är föråldrat. Använd \"apt-mark auto\" och \"apt-mark manual"
+"\" istället."
#: cmdline/apt-get.cc:2185
msgid "Calculating upgrade... "
msgstr "Beräknar uppgradering... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Misslyckades"
@@ -855,7 +857,7 @@ msgstr ""
#: cmdline/apt-get.cc:2393
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "Hämtar %s %s"
#: cmdline/apt-get.cc:2453
msgid "Must specify at least one package to fetch source for"
@@ -954,6 +956,8 @@ msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"Ingen arkitekturinformation tillgänglig för %s. Se apt.conf(5) APT::"
+"Architectures för inställning"
#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
#, c-format
@@ -1028,11 +1032,11 @@ msgstr "Misslyckades med att behandla byggberoenden"
msgid "Changelog for %s (%s)"
msgstr "Ansluter till %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1120,7 +1124,7 @@ msgstr ""
"för mer information och flaggor.\n"
" Denna APT har Speciella Ko-Krafter.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1200,8 +1204,7 @@ msgid "%s was already not hold.\n"
msgstr "%s är redan den senaste versionen.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Väntade på %s men den fanns inte där"
@@ -1218,7 +1221,7 @@ msgstr "Misslyckades med att öppna %s"
#: cmdline/apt-mark.cc:332
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Körning av dpkg misslyckades. Är du root?"
#: cmdline/apt-mark.cc:379
msgid ""
@@ -1339,8 +1342,8 @@ msgstr "Tidsgränsen för anslutningen överskreds"
msgid "Server closed the connection"
msgstr "Servern stängde anslutningen"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Läsfel"
@@ -1353,8 +1356,8 @@ msgid "Protocol corruption"
msgstr "Protokollet skadat"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Skrivfel"
@@ -1408,7 +1411,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutningen"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problem med att lägga filen till hashtabellen"
@@ -1437,96 +1440,90 @@ msgid "Unable to invoke "
msgstr "Kunde inte starta "
# Felmeddelande för misslyckad chdir
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Ansluter till %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
# [f]amilj, [t]yp, [p]rotokoll
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Kunde inte skapa ett uttag (socket) för %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Kunde inte initiera anslutningen till %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen överskred tidsgräns"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Kunde inte ansluta till %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Ansluter till %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Kunde inte slå upp \"%s\""
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporärt fel vid uppslagning av \"%s\""
# Okänd felkod; %i = koden
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
-
-# Okänd felkod; %i = koden
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Kunde inte ansluta till %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Internt fel: Korrekt signatur men kunde inte fastställa nyckelns "
"fingeravtryck?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Minst en ogiltig signatur träffades på."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Kunde inte köra \"gpgv\" för att verifiera signatur (är gpgv installerad?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Okänt fel vid körning av gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Följande signaturer är ogiltiga:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1536,7 +1533,7 @@ msgstr ""
#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "Tomma filer kan inte vara giltiga arkiv"
#: methods/http.cc:394
msgid "Waiting for headers"
@@ -1566,53 +1563,53 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
msgid "Unknown date format"
msgstr "Okänt datumformat"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Anslutningen överskred tidsgränsen"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Fel vid läsning från server"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Felaktiga data i huvud"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Anslutningen misslyckades"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Internt fel"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Kunde inte läsa %s"
@@ -1738,7 +1735,7 @@ msgstr ""
" -c=? Läs denna konfigurationsfil.\n"
" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Kunde inte skriva till %s"
@@ -1884,8 +1881,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Kunde inte öppna DB-filen %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Misslyckades med att ta status på %s"
@@ -1898,90 +1895,90 @@ msgstr "Arkivet har ingen styrpost"
msgid "Unable to get a cursor"
msgstr "Kunde inte få tag i någon markör"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "V: Kunde inte läsa katalogen %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "V: Kunde inte ta status på %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "F: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "V: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "F: Felen gäller filen "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Misslyckades med att slå upp %s"
# ???
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Trädvandring misslyckades"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Misslyckades med att öppna %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Avlänka %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Misslyckades med att läsa länken %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Misslyckades med att länka ut %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Misslyckades med att länka %s till %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Avlänkningsgränsen på %sB nåddes.\n"
# Fält vid namn "Package"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Arkivet har inget package-fält"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen post i override-filen\n"
# parametrar: paket, ny, gammal
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig för paketet %s är %s ej %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen källåsidosättningspost\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har heller ingen binär åsidosättningspost\n"
@@ -2057,7 +2054,7 @@ msgstr "Misslyckades med att läsa vid beräkning av MD5"
msgid "Problem unlinking %s"
msgstr "Problem med att länka ut %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Misslyckades med att byta namn på %s till %s"
@@ -2202,54 +2199,54 @@ msgstr "Misslyckades med att skriva filen %s"
msgid "Failed to close file %s"
msgstr "Misslyckades med att stänga filen %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Sökvägen %s är för lång"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Packar upp %s flera gånger"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Katalogen %s är omdirigerad"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Paketet försöker att skriva till omdirigeringsmålet %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Omdirigeringssökvägen är för lång"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Katalogen %s ersätts av en icke-katalog"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Misslyckades med att hitta noden i sin hashkorg"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Sökvägen är för lång"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Skriv över paketträff utan version för %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Filen %s/%s skriver över den i paketet %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Kunde inte ta status på %s"
@@ -2331,30 +2328,30 @@ msgstr ""
"av användaren."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%limin %lis"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%lis"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Valet %s hittades inte"
@@ -2424,16 +2421,6 @@ msgstr "%c%s... Fel!"
msgid "%c%s... Done"
msgstr "%c%s... Färdig"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Färdig"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2518,23 +2505,25 @@ msgstr "Kunde inte erhålla låset %s"
#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "Lista över filer kan inte skapas eftersom \"%s\" inte är en katalog"
#: apt-pkg/contrib/fileutl.cc:426
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "Ignorerar \"%s\" i katalogen \"%s\" eftersom det inte är en vanlig fil"
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
+"Ignorerar \"%s\" i katalogen \"%s\" eftersom den inte har någon filändelse"
#: apt-pkg/contrib/fileutl.cc:453
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
+"Ignorerar \"%s\" i katalogen \"%s\" eftersom den har en ogiltig filändelse"
#: apt-pkg/contrib/fileutl.cc:840
#, c-format
@@ -2546,69 +2535,63 @@ msgstr "Underprocessen %s råkade ut för ett segmenteringsfel."
msgid "Sub-process %s received signal %u."
msgstr "Underprocessen %s tog emot signal %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s svarade med en felkod (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s avslutades oväntat"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Kunde inte öppna filen %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Kunde inte öppna filhandtag %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Misslyckades med att skapa underprocess-IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Misslyckades med att starta komprimerare "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem med att stänga filen %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem med att byta namn på filen %s till %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem med att avlänka filen %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problem med att synkronisera filen"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Ingen nyckelring installerad i %s."
-
# Felmeddelande
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
@@ -2636,61 +2619,61 @@ msgstr "Denna APT saknar stöd för versionssystemet \"%s\""
msgid "The package cache was built for a different architecture"
msgstr "Paketcachen byggdes för en annan arkitektur"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Beroende av"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Förberoende av"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Föreslår"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Rekommenderar"
# "Konfliktar"?
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Står i konflikt med"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Ersätter"
# "Föråldrar"?
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Föråldrar"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Gör sönder"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Utökar"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "viktigt"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "nödvändigt"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "valfri"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2790,12 +2773,12 @@ msgstr "Öppnar %s"
msgid "Line %u too long in source list %s."
msgstr "Rad %u är för lång i källistan %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Rad %u i källistan %s har fel format (typ)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
@@ -2838,7 +2821,7 @@ msgid ""
msgstr ""
"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2846,11 +2829,11 @@ msgstr ""
"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
"tillbakahållna paket."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2902,13 +2885,13 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck på Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketsystemet \"%s\" stöds inte"
#
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunde inte fastställa en lämplig paketsystemstyp"
@@ -2939,6 +2922,8 @@ msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"Värdet \"%s\" är ogiltigt för APT::Default-Release eftersom en sådan utgåva "
+"inte finns tillgänglig i källorna"
# "Package" är en sträng i konfigurationsfilen
#: apt-pkg/policy.cc:399
@@ -2963,14 +2948,14 @@ msgstr "Cachen har ett inkompatibelt versionssystem"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Fel uppstod vid hantering av %s (FindPkg)"
@@ -2991,27 +2976,27 @@ msgstr "Grattis, du överskred antalet beskrivningar som denna APT kan hantera."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Kunde inte ta status på källkodspaketlistan %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Läser paketlistor"
# Bättre ord?
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Samlar filtillhandahållningar"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "In-/utfel vid lagring av källcache"
@@ -3024,43 +3009,47 @@ msgstr "namnbyte misslyckades, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hash-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"Kunde inte hitta förväntad post \"%s\" i Release-filen (Felaktig post i "
+"sources.list eller felformulerad fil)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunde inte tolka \"Release\"-filen %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"Release-filen för %s har gått ut (ogiltig sedan %s). Uppdateringar för det "
+"här förrådet kommer inte tillämpas."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Ett fel inträffade vid verifiering av signaturen. Förrådet har inte "
@@ -3068,12 +3057,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fel: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3082,7 +3071,7 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3091,37 +3080,37 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Storleken stämmer inte"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Kunde inte tolka \"Release\"-filen %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Inga sektioner i Release-filen %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Ingen Hash-post i Release-filen %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ogiltig \"Date\"-post i Release-filen %s"
@@ -3221,22 +3210,22 @@ msgstr "Skriver ny källista\n"
msgid "Source list entries for this disc are:\n"
msgstr "Poster i källistan för denna skiva:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Skrev %i poster.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Skrev %i poster med %i saknade filer.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Skrev %i poster med %i filer som inte stämmer\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n"
@@ -3251,6 +3240,17 @@ msgstr "Kan inte hitta autentiseringspost för: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-kontrollsumman stämmer inte för: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Filen %s börjar inte med ett klarsignerat meddelande"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Ingen nyckelring installerad i %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3309,128 +3309,128 @@ msgstr ""
#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
msgid "Send scenario to solver"
-msgstr ""
+msgstr "Skicka scenario till lösare"
#: apt-pkg/edsp.cc:209
msgid "Send request to solver"
-msgstr ""
+msgstr "Skicka begäran till lösare"
#: apt-pkg/edsp.cc:279
msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Förbered för mottagning av lösning"
#: apt-pkg/edsp.cc:286
msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "Extern lösare misslyckades utan ett riktigt felmeddelande"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
-msgstr ""
+msgstr "Kör extern lösare"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Installerar %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Konfigurerar %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Tar bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Uppmärksammar försvinnandet av %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Kör efterinstallationsutlösare %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Katalogen \"%s\" saknas"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Kunde inte öppna filen \"%s\""
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Förbereder %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Packar upp %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Förbereder konfigurering av %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Installerade %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Förbereder borttagning av %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Tog bort %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Förbereder borttagning av hela %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Tog bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Kör dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "Åtgärden avbröts innan den kunde färdigställas"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "beroendeproblem - lämnar okonfigurerad"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3438,7 +3438,7 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är "
"ett efterföljande fel från ett tidigare problem."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3454,7 +3454,15 @@ msgstr ""
"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
"är slut"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ingen apport-rapport skrevs eftersom felmeddelandet antyder ett problem i "
+"det lokala systemet"
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3487,6 +3495,23 @@ msgstr ""
msgid "Not locked"
msgstr "Inte låst"
+# Okänd felkod; %i = koden
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Färdig"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Ett fel inträffade vid verifiering av signaturen. Förrådet har inte "
+#~ "uppdaterats och de tidigare indexfilerna kommer att användas. GPG-fel: "
+#~ "%s: %s\n"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Hoppar över icke-existerande filen %s"
diff --git a/po/th.po b/po/th.po
index e093cd702..1d3ccc886 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-10-27 22:44+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -154,7 +154,7 @@ msgid " Version table:"
msgstr " ตารางรุ่น:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -623,7 +623,7 @@ msgstr "เลิกทำ"
msgid "Do you want to continue [Y/n]? "
msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
@@ -804,7 +804,7 @@ msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แ
msgid "Calculating upgrade... "
msgstr "กำลังคำนวณการปรับรุ่น... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "ล้มเหลว"
@@ -993,11 +993,11 @@ msgstr "ติดตั้งสิ่งที่จำเป็นสำหร
msgid "Changelog for %s (%s)"
msgstr "ปูมการแก้ไขสำหรับ %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "มอดูลที่รองรับ:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1084,7 +1084,7 @@ msgstr ""
"และ apt.conf(5)\n"
" APT นี้มีพลังของ Super Cow\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1159,8 +1159,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
@@ -1312,8 +1311,8 @@ msgstr "หมดเวลารอเชื่อมต่อ"
msgid "Server closed the connection"
msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "การอ่านข้อมูลผิดพลาด"
@@ -1326,8 +1325,8 @@ msgid "Protocol corruption"
msgstr "มีความเสียหายของโพรโทคอล"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "การเขียนข้อมูลผิดพลาด"
@@ -1381,7 +1380,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก
msgid "Unable to accept connection"
msgstr "ไม่สามารถรับการเชื่อมต่อ"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
@@ -1408,90 +1407,85 @@ msgstr "สอบถาม"
msgid "Unable to invoke "
msgstr "ไม่สามารถเรียก "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "เชื่อมต่อไปยัง %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "ไม่สามารถสร้างซ็อกเก็ตสำหรับ %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "ไม่สามารถเริ่มการเชื่อมต่อไปยัง %s:%s (%s)"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s)"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "เชื่อมต่อไปยัง %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1529,53 +1523,53 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์
msgid "Unknown date format"
msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "select ไม่สำเร็จ"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "หมดเวลารอเชื่อมต่อ"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "ข้อมูลส่วนหัวผิดพลาด"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "เชื่อมต่อไม่สำเร็จ"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "ข้อผิดพลาดภายใน"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "ไม่สามารถอ่าน %s"
@@ -1693,7 +1687,7 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งนี้\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
@@ -1833,8 +1827,8 @@ msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ
msgid "Unable to open DB file %s: %s"
msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "stat %s ไม่สำเร็จ"
@@ -1847,87 +1841,87 @@ msgstr "แพกเกจไม่มีระเบียนควบคุม
msgid "Unable to get a cursor"
msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: อ่านไดเรกทอรี %s ไม่สำเร็จ\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: stat %s ไม่สำเร็จ\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: ข้อผิดพลาดเกิดกับแฟ้ม "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "หาพาธเต็มของ %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "เดินท่องต้นไม้ไม่สำเร็จ"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "เปิด %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "readlink %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "unlink %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ไม่มีข้อมูล override\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
@@ -2001,7 +1995,7 @@ msgstr "อ่านแฟ้มไม่สำเร็จขณะคำนว
msgid "Problem unlinking %s"
msgstr "มีปัญหาขณะลบแฟ้ม %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
@@ -2146,54 +2140,54 @@ msgstr "ไม่สามารถเขียนแฟ้ม %s"
msgid "Failed to close file %s"
msgstr "ไม่สามารถปิดแฟ้ม %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "พาธ %s ยาวเกินไป"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "พยายามแตกแพกเกจ %s มากกว่าหนึ่งครั้ง"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "ไดเรกทอรี %s ถูก divert"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "แพกเกจนี้พยายามเขียนลงปลายทางของ diversion %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "พาธของ diversion ยาวเกินไป"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "ไดเรกทอรี %s กำลังจะถูกแทนที่ด้วยสิ่งที่ไม่ใช่ไดเรกทอรี"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "หาโหนดใน bucket ของแฮชไม่พบ"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "พาธยาวเกินไป"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "พบแพกเกจที่เขียนทับโดยไม่มีข้อมูลรุ่นสำหรับ %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพกเกจ %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "ไม่สามารถ stat %s"
@@ -2271,30 +2265,30 @@ msgid ""
msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liวัน %liชม. %liนาที %liวิ"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%liชม. %liนาที %liวิ"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%liนาที %liวิ"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%liวิ"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "ไม่พบรายการเลือก %s"
@@ -2364,16 +2358,6 @@ msgstr "%c%s... ผิดพลาด!"
msgid "%c%s... Done"
msgstr "%c%s... เสร็จแล้ว"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... เสร็จแล้ว"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2485,69 +2469,63 @@ msgstr "โพรเซสย่อย %s เกิดข้อผิดพล
msgid "Sub-process %s received signal %u."
msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "ไม่สามารถเปิดแฟ้ม %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "ไม่สามารถเปิด file destriptor %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "สร้าง IPC ของโพรเซสย่อยไม่สำเร็จ"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "เกิดปัญหาขณะปิดแฟ้ม %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "เกิดปัญหาขณะลบแฟ้ม %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "เกิดปัญหาขณะ sync แฟ้ม"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "แคชของแพกเกจว่างเปล่า"
@@ -2573,59 +2551,59 @@ msgstr "APT รุ่นนี้ไม่รองรับระบบนั
msgid "The package cache was built for a different architecture"
msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "ต้องใช้"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "ต้องใช้ขณะติดตั้ง"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "แนะนำ"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "ควรใช้ร่วมกับ"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "ขัดแย้งกับ"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "แทนที่"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "ใช้แทน"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "ทำให้พัง"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "เพิ่มความสามารถ"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "สำคัญ"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "จำเป็น"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "มาตรฐาน"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "ตัวเลือก"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "ส่วนเสริม"
@@ -2725,12 +2703,12 @@ msgstr "กำลังเปิด %s"
msgid "Line %u too long in source list %s."
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
@@ -2772,7 +2750,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ"
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2780,11 +2758,11 @@ msgstr ""
"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย "
"อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้"
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2832,12 +2810,12 @@ msgstr "ไม่สามารถเรียกทำงานวิธีก
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "ไม่รองรับระบบแพกเกจ '%s'"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้"
@@ -2890,14 +2868,14 @@ msgstr "แคชมีระบบนับรุ่นที่ไม่ตร
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
@@ -2918,26 +2896,26 @@ msgstr "โอ้ คุณมาถึงขีดจำกัดจำนว
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "กำลังอ่านรายชื่อแพกเกจ"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
@@ -2950,12 +2928,12 @@ msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s ->
msgid "MD5Sum mismatch"
msgstr "MD5Sum ไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "ผลรวมแฮชไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2964,16 +2942,16 @@ msgstr ""
"ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง "
"หรือแฟ้มผิดรูปแบบ)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2982,71 +2960,71 @@ msgstr ""
"แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ "
"ของคลังแพกเกจนี้"
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"เกิดข้อผิดพลาดขณะตรวจสอบลายเซ็น จะไม่ปรับข้อมูลคลังแพกเกจนี้ และจะใช้แฟ้มดัชนีเก่า "
"ข้อผิดพลาดจาก GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, 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)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, 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."
msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง"
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "ขนาดไม่ตรงกัน"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "ไม่สามารถแจงแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
@@ -3144,22 +3122,22 @@ msgstr "กำลังเขียนรายชื่อแหล่งแพ
msgid "Source list entries for this disc are:\n"
msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "เขียนแล้ว %i ระเบียน\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มผิดขนาด %i แฟ้ม\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n"
@@ -3174,6 +3152,17 @@ msgstr "ไม่พบระเบียนยืนยันความแท
msgid "Hash mismatch for: %s"
msgstr "แฮชไม่ตรงกันสำหรับ: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3238,122 +3227,122 @@ msgstr "เตรียมรับคำตอบ"
msgid "External solver failed without a proper error message"
msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "กำลังติดตั้ง %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "กำลังตั้งค่า %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "กำลังถอดถอน %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "กำลังถอดถอน %s อย่างสมบูรณ์"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "กำลังจดบันทึกการหายไปของ %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "ไม่มีไดเรกทอรี '%s'"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "กำลังเตรียม %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "กำลังแตกแพกเกจ %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "กำลังเตรียมตั้งค่า %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "ติดตั้ง %s แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "กำลังเตรียมถอดถอน %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "ถอดถอน %s แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
"หรือเปล่า?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "กำลังเรียก dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า"
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3365,7 +3354,13 @@ msgid ""
"error"
msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3395,8 +3390,20 @@ msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรี
msgid "Not locked"
msgstr "ไม่ได้ล็อคอยู่"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... เสร็จแล้ว"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "เกิดข้อผิดพลาดขณะตรวจสอบลายเซ็น จะไม่ปรับข้อมูลคลังแพกเกจนี้ และจะใช้แฟ้มดัชนีเก่า "
+#~ "ข้อผิดพลาดจาก GPG: %s: %s\n"
#~ msgid "Failed to remove %s"
#~ msgstr "ไม่สามารถลบ %s"
diff --git a/po/tl.po b/po/tl.po
index 964710f42..59da4d240 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+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"
@@ -160,7 +160,7 @@ msgid " Version table:"
msgstr " Talaang Bersyon:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
@@ -647,7 +647,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
@@ -832,7 +832,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Bigo"
@@ -1022,11 +1022,11 @@ msgstr "Bigo sa pagproseso ng build dependencies"
msgid "Changelog for %s (%s)"
msgstr "Kumokonekta sa %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1111,7 +1111,7 @@ msgstr ""
"para sa karagdagang impormasyon at mga option.\n"
" Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1182,8 +1182,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
@@ -1321,8 +1320,8 @@ msgstr "Lumipas ang koneksyon"
msgid "Server closed the connection"
msgstr "Sinarhan ng server ang koneksyon"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Error sa pagbasa"
@@ -1335,8 +1334,8 @@ msgid "Protocol corruption"
msgstr "Sira ang protocol"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Error sa pagsulat"
@@ -1390,7 +1389,7 @@ msgstr "Nag-timeout ang socket ng datos"
msgid "Unable to accept connection"
msgstr "Hindi makatanggap ng koneksyon"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Problema sa pag-hash ng talaksan"
@@ -1417,94 +1416,89 @@ msgstr "Tanong"
msgid "Unable to invoke "
msgstr "Hindi ma-invoke "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Kumokonekta sa %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Hindi maka-konekta sa %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Kumokonekta sa %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Hindi maresolba ang '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Hindi maka-konekta sa %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
"fingerprint?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Hindi kilalang error sa pag-execute ng gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1544,53 +1538,53 @@ msgstr "Sira ang range support ng HTTP server na ito"
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Bigo ang pagpili"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Error sa pagsulat ng talaksang output"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Error sa pagsusulat sa talaksan"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Maling datos sa panimula"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Internal na error"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Hindi mabasa ang %s"
@@ -1712,7 +1706,7 @@ msgstr ""
" -c=? Basahin ang talaksang pagkaayos na ito\n"
" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Hindi makapagsulat sa %s"
@@ -1863,8 +1857,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Hindi mabuksan ang talaksang DB %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Bigo ang pag-stat ng %s"
@@ -1877,87 +1871,87 @@ msgstr "Walang kontrol rekord ang arkibo"
msgid "Unable to get a cursor"
msgstr "Hindi makakuha ng cursor"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Hindi mabasa ang directory %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Hindi ma-stat %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "E: Mga error ay tumutukoy sa talaksang "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Bigo sa pag-resolba ng %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Bigo ang paglakad sa puno"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Bigo ang pagbukas ng %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Bigo ang pagbasa ng link %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Bigo ang pag-unlink ng %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Bigo ang pag-link ng %s sa %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit na %sB tinamaan.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Walang field ng pakete ang arkibo"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ay walang override entry\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Tagapangalaga ng %s ay %s hindi %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ay walang override entry para sa pinagmulan\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ay wala ring override entry na binary\n"
@@ -2031,7 +2025,7 @@ msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
msgid "Problem unlinking %s"
msgstr "Problema sa pag-unlink ng %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
@@ -2177,54 +2171,54 @@ msgstr "Bigo sa pagsulat ng talaksang %s"
msgid "Failed to close file %s"
msgstr "Bigo sa pagsara ng talaksang %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Sobrang haba ang path na %s"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Binubuklat ang %s ng labis sa isang beses"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Ang directory %s ay divertado"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Sobrang haba ng path na diversion"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Ang directory %s ay papalitan ng hindi-directory"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Bigo ang paghanap ng node sa kanyang hash bucket"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Sobrang haba ng path"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Hindi ma-stat ang %s"
@@ -2304,30 +2298,30 @@ msgid ""
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Piniling %s ay hindi nahanap"
@@ -2399,16 +2393,6 @@ msgstr "%c%s... Error!"
msgid "%c%s... Done"
msgstr "%c%s... Tapos"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Tapos"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2525,69 +2509,63 @@ msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
msgid "Sub-process %s received signal %u."
msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Naghudyat ang sub-process %s ng error code (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Hindi mabuksan ang talaksang %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Hindi makapag-bukas ng pipe para sa %s"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Bigo ang paglikha ng subprocess IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Bigo ang pag-exec ng taga-compress"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Problema sa pagsara ng talaksan"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problema sa pag-sync ng talaksan"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Problema sa pag-unlink ng talaksan"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Problema sa pag-sync ng talaksan"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Ina-abort ang pag-instol."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Walang laman ang cache ng pakete"
@@ -2614,59 +2592,59 @@ msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'"
msgid "The package cache was built for a different architecture"
msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Dependensiya"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "PreDepends"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Mungkahi"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Rekomendado"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Tunggali"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Pumapalit"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Linalaos"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "kailangan"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "optional"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "extra"
@@ -2767,12 +2745,12 @@ msgstr "Binubuksan %s"
msgid "Line %u too long in source list %s."
msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
@@ -2814,7 +2792,7 @@ msgstr ""
"Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
"para dito."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2822,12 +2800,12 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
"ito ng mga paketeng naka-hold."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2879,12 +2857,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Hindi suportado ang sistema ng paketeng '%s'"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
@@ -2940,14 +2918,14 @@ msgstr "Hindi akma ang versioning system ng cache"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
@@ -2970,27 +2948,27 @@ msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
"Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya."
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Binabasa ang Listahan ng mga Pakete"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Kinukuha ang Talaksang Provides"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "IO Error sa pag-imbak ng source cache"
@@ -3003,54 +2981,54 @@ msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3059,7 +3037,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:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3068,7 +3046,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:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3076,31 +3054,31 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Di tugmang laki"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Paunawa, pinili ang %s imbes na %s\n"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Di tanggap na linya sa talaksang diversion: %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
@@ -3199,22 +3177,22 @@ msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
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/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Nagsulat ng %i na record.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3231,6 +3209,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Di tugmang MD5Sum"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Ina-abort ang pag-instol."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3294,119 +3283,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, fuzzy, c-format
msgid "Installing %s"
msgstr "Iniluklok ang %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Isasaayos ang %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Tinatanggal ang %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Natanggal ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Nawawala ang directory ng talaan %spartial."
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Hindi mabuksan ang talaksang %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Hinahanda ang %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Binubuklat ang %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Hinahanda ang %s upang isaayos"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Iniluklok ang %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Naghahanda para sa pagtanggal ng %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Tinanggal ang %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Natanggal ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3418,7 +3407,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3448,6 +3443,14 @@ msgid "Not locked"
msgstr ""
#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Tapos"
+
+#, fuzzy
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Binubuksan ang talaksang pagsasaayos %s"
diff --git a/po/uk.po b/po/uk.po
index 046caead1..59ba1d9ad 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-09-25 20:19+0300\n"
"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -163,7 +163,7 @@ msgid " Version table:"
msgstr " Таблиця версій:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -644,7 +644,7 @@ msgstr "Перервано."
msgid "Do you want to continue [Y/n]? "
msgstr "Бажаєте продовжити [Y/n]? "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не вдалося завантажити %s %s\n"
@@ -844,7 +844,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Обчислення оновлень... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Невдача"
@@ -1045,11 +1045,11 @@ msgstr "Обробка залежностей для побудови закін
msgid "Changelog for %s (%s)"
msgstr "Журнал змін для %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1141,7 +1141,7 @@ msgstr ""
"містять більше інформації і опцій.\n"
" Цей APT має Супер-Коров'ячу Силу.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1216,8 +1216,7 @@ msgid "%s was already not hold.\n"
msgstr "%s вже був незафіксований.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Очікував на %s, але його там не було"
@@ -1376,8 +1375,8 @@ msgstr "Час з'єднання вичерпався"
msgid "Server closed the connection"
msgstr "Сервер закрив з'єднання"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Помилка зчитування"
@@ -1390,8 +1389,8 @@ msgid "Protocol corruption"
msgstr "Спотворений протокол"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Помилка запису"
@@ -1445,7 +1444,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс
msgid "Unable to accept connection"
msgstr "Неможливо прийняти з'єднання"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Проблема хешування файла"
@@ -1472,92 +1471,87 @@ msgstr "Черга"
msgid "Unable to invoke "
msgstr "Неможливо викликати "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "З'єднання з %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Неможливо почати з'єднання з %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Неможливо під'єднатися до %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "З'єднання з %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Не можу знайти IP адрес для %s"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Тимчасова помилка при отриманні IP адреси '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Неможливо під'єднатися до %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
"відбиток?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Знайдено як мінімум один невірний підпис."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Невідома помилка виконання gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Наступні підписи були невірними:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1597,53 +1591,53 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran
msgid "Unknown date format"
msgstr "Невідомий формат дати"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Вибір провалився"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Час очікування з'єднання вийшов"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Помилка запису у вихідний файл"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Помилка запису у файл"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Помилка запису у файл"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Помилка зчитування з сервера"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Погана заголовкова інформація"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "З'єднання не вдалося"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Внутрішня помилка"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Неможливо прочитати %s"
@@ -1769,7 +1763,7 @@ msgstr ""
" -c=? Читати зазначений конфігураційний файл\n"
" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Неможливо записати в %s"
@@ -1924,8 +1918,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Не вдалося відкрити файл БД %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Не вдалося одержати атрибути %s"
@@ -1938,87 +1932,87 @@ msgstr "В архіві немає запису 'control'"
msgid "Unable to get a cursor"
msgstr "Неможливо одержати курсор"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "У: Не вдалося прочитати директорію %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "У: Неможливо прочитати атрибути %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "П: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "У: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "П: Помилки відносяться до файлу "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Не вдалося визначити %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Не вдалося зробити обхід дерева"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Не вдалося відкрити %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr "DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Не вдалося прочитати посилання (readlink) %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Не вдалося видалити посилання (unlink) %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Не вдалося створити посилання %s на %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Перевищено ліміт в %sB в DeLink.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Архів не мав поля 'package'"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, fuzzy, c-format
msgid " %s has no override entry\n"
msgstr " Відсутній запис про перепризначення (override) для %s\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакунок %s супроводжується %s, а не %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n"
@@ -2092,7 +2086,7 @@ msgstr "Помилка зчитування під час обчислення M
msgid "Problem unlinking %s"
msgstr "Не вдалося видалити %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Не вдалося перейменувати %s на %s"
@@ -2241,56 +2235,56 @@ msgstr "Не вдалося записати файл %s"
msgid "Failed to close file %s"
msgstr "Не вдалося закрити файл %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Шлях %s занадто довгий"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Розпакування %s більш ніж один раз"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, fuzzy, c-format
msgid "The directory %s is diverted"
msgstr "Директорія %s є відхиленою (diverted)"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Пакунок пробує записати у ціль з diversion %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
#, fuzzy
msgid "The diversion path is too long"
msgstr "Шлях 'diversion' є занадто довгим"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Директорія %s замінюється не директорією"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
#, fuzzy
msgid "Failed to locate node in its hash bucket"
msgstr "Не вдалося знайти вузол у його наборі хешів"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Шлях занадто довгий"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Перезаписати відповідність пакунка без версії для %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Файл %s/%s перезаписує інший файл в пакунку %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Неможливо прочитати атрибути %s"
@@ -2371,30 +2365,30 @@ msgstr ""
"користувачем."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%liд %liг %liхв %liс"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%liг %liхв %liс"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%liхв %liс"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%liс"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Вибір %s не знайдено"
@@ -2468,16 +2462,6 @@ msgstr "%c%s... Помилка!"
msgid "%c%s... Done"
msgstr "%c%s... Виконано"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Виконано"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2595,69 +2579,63 @@ msgstr "Підпроцес %s отримав 'segmentation fault' (фаталь
msgid "Sub-process %s received signal %u."
msgstr "Підпроцес %s отримав сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Підпроцес %s повернув код помилки (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Підпроцес %s раптово завершився"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Неможливо відкрити файл %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Неможливо відкрити файловий дескриптор %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Не вдалося створити IPC з породженим процесом"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Не вдалося виконати компресор "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "записування, повинен був записати ще %llu байт, але не вдалося"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Проблема з закриттям файла %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Проблема з перейменуванням файла %s на %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Проблема з роз'єднанням файла %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Проблема з синхронізацією файла"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Не встановлено 'keyring' у %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Кеш пакунків пустий"
@@ -2683,59 +2661,59 @@ msgstr "Цей APT не підтримує систему призначення
msgid "The package cache was built for a different architecture"
msgstr "Кеш пакунків був побудований для іншої архітектури"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Залежності (Depends)"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Пре-Залежності (PreDepends)"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Пропонує (Suggests)"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Рекомендує (Recommends)"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Конфлікти (Conflicts)"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Заміняє (Replaces)"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Застарілі (Obsoletes)"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Ламає (Breaks)"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Покращує (Enhances)"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "важливі (important)"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "необхідні (required)"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "стандартні (standard)"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "необов'язкові (optional)"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "додаткові (extra)"
@@ -2837,12 +2815,12 @@ msgstr "Відкриття %s"
msgid "Line %u too long in source list %s."
msgstr "Рядок %u є занадто довгим у переліку джерел %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
@@ -2885,7 +2863,7 @@ msgid ""
msgstr ""
"Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів."
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2893,11 +2871,11 @@ msgstr ""
"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
"пов'язано з зафіксованими пакунками."
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2948,12 +2926,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Система пакування '%s' не підтримується"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Неможливо визначити тип необхідної системи пакування"
@@ -3008,14 +2986,14 @@ msgstr "Кеш має несумісну систему призначення
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Виникла помилка під час обробки %s (%s%d)"
@@ -3036,27 +3014,27 @@ msgstr "Ого! Ви перевищили кількість описів, як
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Пакунок %s %s не був знайдений під час обробки залежностей"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Зчитування переліків пакунків"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
#, fuzzy
msgid "Collecting File Provides"
msgstr "Збирання інформації про 'File Provides'"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Помилка IO під час збереження кешу вихідних текстів"
@@ -3069,12 +3047,12 @@ msgstr "не вдалося перейменувати, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Невідповідність MD5Sum"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Невідповідність хешу MD5Sum"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3083,16 +3061,16 @@ msgstr ""
"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
"sources.list, або пошкоджений файл)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3101,27 +3079,27 @@ msgstr ""
"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
"репозиторія не будуть застосовані."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Виникла помилка під час перевірки підпису. Репозиторій не оновлено, "
"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Помилка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3130,7 +3108,7 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок. (через відсутність 'arch')"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3139,38 +3117,38 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок."
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Невідповідність розміру"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Неможливо проаналізувати 'Release' файл %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Немає секцій у 'Release' файлі %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Немає запису 'Hash' у 'Release' файлі %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Невірний запис 'Date' у 'Release' файлі %s"
@@ -3270,22 +3248,22 @@ msgstr "Записується новий перелік вихідних тек
msgid "Source list entries for this disc are:\n"
msgstr "Перелік вихідних текстів для цього диска:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Записано %i записів.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Записано %i записів з %i відсутніми файлами.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Записано %i записів з %i невідповідними файлам\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n"
@@ -3300,6 +3278,17 @@ msgstr "Неможливо знайти аутентифікаційний за
msgid "Hash mismatch for: %s"
msgstr "Невідповідність хешу для: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Файл %s починається з не 'clearsigned' повідомленням"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Не встановлено 'keyring' у %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3374,117 +3363,117 @@ msgstr ""
"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
"помилку"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
#, fuzzy
msgid "Execute external solver"
msgstr "Виконати зовнішній розв'язувач"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Встановлюється %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Налаштовується %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Видаляється %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Повністю видаляється %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Взято до відома зникнення %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Виконується післяустановочний ініціатор %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Директорія '%s' відсутня"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Неможливо відкрити файл '%s'"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Підготовка %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Розпакування %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Підготовка до конфігурації %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Встановлено %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Підготовка до видалення %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Підготовка до повного видалення %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Повністю видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Виконується dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Операцію було перервано до того, як вона мала завершитися"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Звіт apport не був записаний, тому що параметр MaxReports вже досягнув "
"максимальної величини"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "проблеми з залежностями - залишено неналаштованим"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3492,7 +3481,7 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
"що ця помилка є наслідком попередньої невдачі."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3508,7 +3497,13 @@ msgstr ""
"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
"відсутність вільного місця у пам'яті"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3543,8 +3538,21 @@ msgstr ""
msgid "Not locked"
msgstr "Не заблоковано"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Файл %s починається з не 'clearsigned' повідомленням"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr ""
+#~ "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Виконано"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Виникла помилка під час перевірки підпису. Репозиторій не оновлено, "
+#~ "попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Пропускається неіснуючий файл %s"
diff --git a/po/vi.po b/po/vi.po
index 4ba5c19d9..0f86cae34 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2012-11-20 14:12+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -159,7 +159,7 @@ msgid " Version table:"
msgstr " Bảng phiên bản:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -640,7 +640,7 @@ msgstr "Hủy bỏ."
msgid "Do you want to continue [Y/n]? "
msgstr "Bạn có muốn tiếp tục không? [C/k] "
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Việc lấy %s bị lỗi %s\n"
@@ -827,7 +827,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "Đang tính bước nâng cấp... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Gặp lỗi"
@@ -1022,11 +1022,11 @@ msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
msgid "Changelog for %s (%s)"
msgstr "Changelog cho %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1119,7 +1119,7 @@ msgstr ""
" apt-get(8), sources.list(5) và apt.conf(5).\n"
" Trình APT này có năng lực của siêu bò.\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1194,8 +1194,7 @@ msgid "%s was already not hold.\n"
msgstr "%s đã sẵn được đặt là chưa nắm giữ.\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Đã đợi %s nhưng mà chưa gặp nó"
@@ -1353,8 +1352,8 @@ msgstr "Thời hạn kết nối"
msgid "Server closed the connection"
msgstr "Máy phục vụ đã đóng kết nối"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "Lỗi đọc"
@@ -1367,8 +1366,8 @@ msgid "Protocol corruption"
msgstr "Giao thức bị hỏng"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "Lỗi ghi"
@@ -1422,7 +1421,7 @@ msgstr "Quá giờ kết nối ổ cắm dữ liệu"
msgid "Unable to accept connection"
msgstr "Không thể chấp nhận kết nối"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "Gặp khó khăn khi tạo chuỗi duy nhất cho tập tin"
@@ -1449,92 +1448,87 @@ msgstr "Truy vấn"
msgid "Unable to invoke "
msgstr "Không thể gọi "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Đang kết nối đến %s (%s)..."
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[Địa chỉ IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Không thể sở khởi kết nối đến %s:%s (%s)."
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Không thể kết nối đến %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "Đang kết nối đến %s..."
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "Không thể tháo gỡ “%s”"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Việc tháo gỡ “%s” bị lỗi tạm thời"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "Không thể kết nối đến %s: %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay của khóa ?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "Gặp ít nhất một chữ ký không hợp lệ."
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
"Không thể thực hiện “gpgv” để thẩm tra chữ ký (gpgv đã được cài đặt chưa?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "Gặp lỗi không rõ khi thực hiện gpgv"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "Những chữ ký theo đây vẫn không hợp lệ:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1577,53 +1571,53 @@ msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
msgid "Unknown date format"
msgstr "Không rõ dạng ngày"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "Việc chọn bị lỗi"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "Kết nối đã quá giờ"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "Gặp lỗi khi ghi vào tập tin xuất"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "Gặp lỗi khi ghi vào tập tin đó"
-#: methods/http.cc:923
+#: methods/http.cc:919
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:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "Gặp lỗi khi đọc từ máy phục vụ"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "Dữ liệu dòng đầu sai"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "Kết nối bị ngắt"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "Không thể đọc %s"
@@ -1750,7 +1744,7 @@ msgstr ""
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt một tùy chọn cấu hình nhiệm ý, v.d. “-o dir::cache=/tmp”\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "Không thể ghi vào %s"
@@ -1911,8 +1905,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi"
@@ -1925,87 +1919,87 @@ msgstr "Kho không có mục ghi điều khiển"
msgid "Unable to get a cursor"
msgstr "Không thể lấy con chạy"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "CB: Không thể đọc thư mục %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "CB: Không thể lấy thông tin toàn bộ cho %s\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "LỖI: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "CB: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "LỖI: có lỗi áp dụng vào tập tin "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "Việc quyết định %s bị lỗi"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "Việc di chuyển qua cây bị lỗi"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "Việc mở %s bị lỗi"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " Bỏ liên kết %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "Việc tạo liên kết lại %s bị lỗi"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "Việc bỏ liên kết %s bị lỗi"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Việc liên kết %s đến %s bị lỗi"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Hết hạn bỏ liên kết của %sB.\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "Kho không có trường gói"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s không có mục ghi đè\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " người bảo trì %s là %s không phải %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s không có mục ghi đè nguồn\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s cũng không có mục ghi đè nhị phân\n"
@@ -2079,7 +2073,7 @@ msgstr "Việc đọc khi tính MD5 bị lỗi"
msgid "Problem unlinking %s"
msgstr "Gặp lỗi khi bỏ liên kết %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Việc đổi tên %s thành %s bị lỗi"
@@ -2226,54 +2220,54 @@ msgstr "Việc ghi tập tin %s gặp lỗi"
msgid "Failed to close file %s"
msgstr "Việc đóng tập tin %s gặp lỗi"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "Đường dẫn %s quá dài"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "Đang giải nén %s nhiều lần"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "Thư mục %s bị trệch hướng"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "Đường dẫn trệch đi quá dài."
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "Thư mục %s đang được thay thế do điều không phải là thư mục"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "Việc định vị điểm nút trong hộp băm nó bị lỗi"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "Đường dẫn quá dài"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "Không thể lấy các thông tin về %s"
@@ -2356,30 +2350,30 @@ msgstr ""
"dùng tắt."
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%lingày %ligiờ %liphút %ligiây"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%ligiờ %liphút %ligiây"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%liphút %ligiây"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%ligiây"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "Không tìm thấy vùng chọn %s"
@@ -2450,16 +2444,6 @@ msgstr "%c%s... Lỗi!"
msgid "%c%s... Done"
msgstr "%c%s... Hoàn tất"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Hoàn tất"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2575,69 +2559,63 @@ msgstr "Tiến trình phụ %s đã nhận một lỗi chia ra từng đoạn."
msgid "Sub-process %s received signal %u."
msgstr "Tiến trình phụ %s đã nhận tín hiệu %u."
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Tiến trình phụ %s đã trả lời mã lỗi (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Tiến trình phụ %s đã thoát bất thường"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "Không thể mở tập tin %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "Không thể mở bộ mô tả tập tin %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "Việc tạo tiến trình con IPC bị lỗi"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "Việc thực hiện bô nén bị lỗi "
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, c-format
msgid "read, still have %llu to read but none left"
msgstr "đọc, còn cần đọc %llu nhưng mà không có gì còn lại cả"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "ghi, còn cần ghi %llu nhưng mà không thể"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "Gặp vấn đề khi đóng tập tin %s"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gặp vấn đề khi thay tên tập tin %s bằng %s"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Gặp vấn đề khi bỏ liên kết tập tin %s"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "Gặp vấn đề khi đồng bộ hóa tập tin"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "Không có vòng khoá nào được cài đặt vào %s."
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Bộ nhớ tạm gói trống"
@@ -2663,59 +2641,59 @@ msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên b
msgid "The package cache was built for a different architecture"
msgstr "Bộ nhớ tạm gói được xây dựng cho một kiến trức khác"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "Phụ thuộc"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "Phụ thuộc sẵn"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "Đề nghị"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "Khuyến khích"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "Xung đột"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "Thay thế"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "Làm cũ"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "Làm hư"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "Tăng cường"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "quan trọng"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "yêu cầu"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "chuẩn"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "tùy chọn"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "bổ sung"
@@ -2824,12 +2802,12 @@ msgstr "Đang mở %s"
msgid "Line %u too long in source list %s."
msgstr "Dòng %u quá dài trong danh sách nguồn %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)."
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Không biết kiểu “%s” trên dòng %u trong danh sách nguồn %s."
@@ -2871,7 +2849,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:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2879,11 +2857,11 @@ 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:1233
+#: apt-pkg/algorithms.cc:1230
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."
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
"used instead."
@@ -2933,12 +2911,12 @@ msgstr "Phương pháp %s đã không bắt đầu cho đúng."
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Hãy nạp đĩa có nhãn “%s” vào ổ “%s” và bấm nút Enter."
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Không hỗ trợ hệ thống đóng gói “%s”"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp"
@@ -2996,14 +2974,14 @@ msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tư
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Gặp lỗi khi xử lý %s (%s%d)"
@@ -3024,26 +3002,26 @@ msgstr "Ồ, bạn đã vượt quá số mô tả mà trình APT này có thể
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý."
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Không tìm thấy gói %s %s khi xử lý quan hệ phụ thuộc của tập tin"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "Đang đọc các danh sách gói"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "Đang tập hợp các Nhà cung cấp Tập tin"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
@@ -3056,12 +3034,12 @@ msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
msgid "MD5Sum mismatch"
msgstr "Sai khớp MD5Sum (tổng kiểm)"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Sai khớp tổng chuỗi duy nhất (hash sum)"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3070,16 +3048,16 @@ msgstr ""
"Không tìm thấy mục cần thiết '%s' trong tập tin Phát hành (Sai mục trong "
"sources.list hoặc tập tin bị hỏng)"
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
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 mã số khoá theo đây:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3088,15 +3066,15 @@ msgstr ""
"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho "
"này sẽ không được áp dụng."
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Bản phát hành xung đột: %s (mong đợi %s còn nhận %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"Gặp lỗi trong khi thẩm tra chữ ký.\n"
@@ -3104,12 +3082,12 @@ msgstr ""
"Lỗi GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "Lỗi GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3118,7 +3096,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:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3127,7 +3105,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:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3135,33 +3113,33 @@ 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:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "Sai khớp kích cỡ"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "Không có phần nào trong tập tin Phát hành %s"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
"Gặp mục nhập “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát "
"hành %s"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
@@ -3261,22 +3239,22 @@ msgstr "Đang ghi danh sách nguồn mới\n"
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/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "Mới ghi %i mục ghi.\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -3293,6 +3271,17 @@ msgstr "Không tìm thấy mục ghi xác thực cho: %s"
msgid "Hash mismatch for: %s"
msgstr "Sai khớp chuỗi duy nhất cho: %s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "Không có vòng khoá nào được cài đặt vào %s."
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3360,114 +3349,114 @@ msgstr "Chuẩn bị để lấy cách giải quyết"
msgid "External solver failed without a proper error message"
msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr "Thi hành bộ phân giải từ bên ngoài"
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "Đang cài đặt %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "Đang cấu hình %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "Đang gỡ bỏ %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "Đang gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "Đang ghi lưu sự biến mất của %s"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Đang chạy bộ gây nên tiến trình cuối cùng cài đặt %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "Thiếu thư mục “%s”"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "Không thể mở tập tin “%s”"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "Đang chuẩn bị %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "Đang mở gói %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "Đang chuẩn bị cấu hình %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "Đã cài đặt %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "Đang chuẩn bị gỡ bỏ %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "Đã gỡ bỏ %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "Mới gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Không thể ghi lưu, openpty() bị lỗi (“/dev/pts” chưa lắp ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "Đang chạy dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành"
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
"Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không có cấu hình"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
@@ -3475,7 +3464,7 @@ msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý rằng nó là một lỗi kế tiếp "
"do một sự thất bại trước."
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3488,7 +3477,13 @@ msgid ""
msgstr ""
"Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý một lỗi “không đủ bộ nhớ”"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "Không ghi báo cáo apport, vì thông điệp lỗi ngụ ý một lỗi “V/R dpkg”"
@@ -3519,8 +3514,21 @@ msgstr "dpkg bị gián đoạn, bạn cần phải tự động chạy “%s”
msgid "Not locked"
msgstr "Chưa được khoá"
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... Hoàn tất"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "Gặp lỗi trong khi thẩm tra chữ ký.\n"
+#~ "Kho lưu chưa được cập nhật nên dùng những tập tin chỉ mục trước.\n"
+#~ "Lỗi GPG: %s: %s\n"
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "Đang bỏ qua tập tin không tồn tại %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8f25691e9..4ddab31a0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2010-08-26 14:42+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -155,7 +155,7 @@ msgid " Version table:"
msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -629,7 +629,7 @@ msgstr "中止执行。"
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗?[Y/n]"
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
@@ -807,7 +807,7 @@ msgstr ""
msgid "Calculating upgrade... "
msgstr "正在对升级进行计算... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "失败"
@@ -994,11 +994,11 @@ msgstr "无法处理构建依赖关系"
msgid "Changelog for %s (%s)"
msgstr "正在连接 %s (%s)"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1086,7 +1086,7 @@ msgstr ""
"以获取更多信息和选项。\n"
" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1160,8 +1160,7 @@ msgid "%s was already not hold.\n"
msgstr "%s 已经是最新的版本了。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
@@ -1298,8 +1297,8 @@ msgstr "连接超时"
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "读错误"
@@ -1312,8 +1311,8 @@ msgid "Protocol corruption"
msgstr "协议有误"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "写出错"
@@ -1367,7 +1366,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
@@ -1394,90 +1393,85 @@ msgstr "查询"
msgid "Unable to invoke "
msgstr "无法调用 "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "正在连接 %s (%s)"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "无法发起与 %s:%s (%s) 的连接"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "无法连接上 %s:%s (%s),连接超时"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "无法连接上 %s:%s (%s)。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "正在连接 %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "无法解析域名“%s”"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, c-format
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "运行 gpgv 时发生未知错误"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1515,53 +1509,53 @@ msgstr "该 HTTP 服务器的 range 支持不正常"
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "内部错误"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
@@ -1678,7 +1672,7 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
@@ -1822,8 +1816,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "无法打开数据库文件 %s:%s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
@@ -1836,87 +1830,87 @@ msgstr "归档文件没有包含控制字段"
msgid "Unable to get a cursor"
msgstr "无法获得游标"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:无法读取目录 %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:无法获得 %s 的状态\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "错误:"
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "错误:处理文件时出错 "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "无法解析 %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "无法遍历目录树"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "无法打开 %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "无法读取符号链接 %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "无法使用 unlink 删除 %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 无法将 %s 链接到 %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -1990,7 +1984,7 @@ msgstr "在计算 MD5 校验和时无法读取数据"
msgid "Problem unlinking %s"
msgstr "在使用 unlink 删除 %s 时出错"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
@@ -2135,54 +2129,54 @@ msgstr "无法写入文件 %s"
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "路径名 %s 太长"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "%s 被解包了不只一次"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "目录 %s 已被转移"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "该软件包正尝试写入转移对象 %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "该转移路径太长"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "目录 %s 要被一个非目录的文件替换"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "无法在其散列桶中分配节点"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "路径名太长"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "用来覆盖的软件包不属于 %s 的任何版本"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "无法读取 %s 的状态"
@@ -2260,30 +2254,30 @@ msgid ""
msgstr "无法增加 MMap 大小,因为用户已禁用自动增加。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
msgstr "%li天 %li小时 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
msgstr "%li分 %li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "找不到您选则的 %s"
@@ -2353,16 +2347,6 @@ msgstr "%c%s... 有错误!"
msgid "%c%s... Done"
msgstr "%c%s... 完成"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 完成"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2474,69 +2458,63 @@ msgstr "子进程 %s 发生了段错误"
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, c-format
msgid "Could not open file descriptor %d"
msgstr "无法打开文件描述符 %d"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "无法创建子进程的 IPC 管道"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "无法执行压缩程序"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "读取文件出错,还剩 %lu 字节没有读出"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "写入文件出错,还剩 %lu 字节没有保存"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "重命名文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "同步文件出错"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "%s 中没有安装密钥环。"
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
@@ -2563,59 +2541,59 @@ msgstr "本程序目前不支持“%s”版本系统"
msgid "The package cache was built for a different architecture"
msgstr "软件包缓存区是为其它架构的硬件构建的"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "破坏"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
msgstr "增强"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "必需"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "额外"
@@ -2715,12 +2693,12 @@ msgstr "正在打开 %s"
msgid "Line %u too long in source list %s."
msgstr "源列表 %2$s 的第 %1$u 行太长了。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
@@ -2761,7 +2739,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2769,13 +2747,13 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2825,12 +2803,12 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2883,14 +2861,14 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "处理 %s (FindPkg)时出错"
@@ -2911,26 +2889,26 @@ msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "无法获取源软件包列表 %s 的状态"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "正在读取软件包列表"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "正在收集文件所提供的软件包"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "无法读取或写入软件源缓存"
@@ -2943,54 +2921,54 @@ msgstr "无法重命名文件,%s (%s -> %s)。"
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2999,7 +2977,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3007,37 +2985,37 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
@@ -3137,22 +3115,22 @@ msgstr "正在写入新的源列表\n"
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "已写入 %i 条记录。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "已写入 %i 条记录,并有 %i 个文件缺失。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个文件不匹配\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "已写入 %i 条记录,并有 %i 个缺失,以及 %i 个文件不匹配\n"
@@ -3167,6 +3145,17 @@ msgstr "无法找到认证记录:%s"
msgid "Hash mismatch for: %s"
msgstr "Hash 校验和不符:%s"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "%s 中没有安装密钥环。"
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3230,119 +3219,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Completely removing %s"
msgstr "完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
msgstr "注意到 %s 已经消失"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 缺失"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, c-format
msgid "Could not open file '%s'"
msgstr "无法打开文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
msgstr "正在运行 dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。"
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
msgstr "依赖问题 - 保持未配置"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3354,7 +3343,13 @@ msgid ""
"error"
msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
@@ -3383,6 +3378,20 @@ msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。"
msgid "Not locked"
msgstr "未锁定"
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... 完成"
+
+#~ msgid ""
+#~ "An error occurred during the signature verification. The repository is "
+#~ "not updated and the previous index files will be used. GPG error: %s: %s\n"
+#~ msgstr ""
+#~ "校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
+
#~ msgid "Skipping nonexistent file %s"
#~ msgstr "跳过不存在的文件 %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0cb4f8b8c..fc2e06a51 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-04-08 15:40+0200\n"
+"POT-Creation-Date: 2013-04-11 14:52+0200\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -110,7 +110,7 @@ msgstr "您必須明確得給定一個樣式"
#: cmdline/apt-cache.cc:1361
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "此指令已不再用。請改用 apt-mark showauto"
#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
#, c-format
@@ -156,7 +156,7 @@ msgid " Version table:"
msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3363 cmdline/apt-mark.cc:375
+#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375
#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
#, c-format
@@ -292,7 +292,7 @@ msgstr "Y"
#: cmdline/apt-get.cc:140
msgid "N"
-msgstr ""
+msgstr "N"
#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
#, c-format
@@ -445,7 +445,7 @@ msgstr "套件 %s 沒有可安裝的候選版本"
#: cmdline/apt-get.cc:725
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "無法移除如 %s 的虛擬套件\n"
#. TRANSLATORS: Note, this is not an interactive question
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -630,7 +630,7 @@ msgstr "放棄執行。"
msgid "Do you want to continue [Y/n]? "
msgstr "是否繼續進行 [Y/n]?"
-#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1557
+#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法取得 %s,%s\n"
@@ -680,7 +680,7 @@ msgstr ""
#: cmdline/apt-get.cc:1561
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "略過無法提供的 %2$s 套件的 %1$s 目標版本"
#: cmdline/apt-get.cc:1593
#, fuzzy, c-format
@@ -691,7 +691,7 @@ msgstr "無法取得來源套件列表 %s 的狀態"
#: cmdline/apt-get.cc:1631
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "略過無法提供的 %2$s 套件的 %1$s 版本"
#: cmdline/apt-get.cc:1647
msgid "The update command takes no arguments"
@@ -808,13 +808,13 @@ msgstr "%s 被設定為手動安裝。\n"
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
-msgstr ""
+msgstr "此指令已不再用。請改用 apt-mark auto 及 apt-mark manual"
#: cmdline/apt-get.cc:2185
msgid "Calculating upgrade... "
msgstr "籌備升級中... "
-#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:116
+#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "失敗"
@@ -838,7 +838,7 @@ msgstr ""
#: cmdline/apt-get.cc:2393
#, c-format
msgid "Downloading %s %s"
-msgstr ""
+msgstr "下載 %s %s"
#: cmdline/apt-get.cc:2453
msgid "Must specify at least one package to fetch source for"
@@ -855,6 +855,8 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
+"請注意`:'%s' 套件是在下列位置被 '%s' 版本控制系統所維護的`:\n"
+"%s\n"
#: cmdline/apt-get.cc:2515
#, c-format
@@ -863,6 +865,9 @@ msgid ""
"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
+"請以:\n"
+"bzr branch %s\n"
+"取得該套件最新 (可能未發佈) 的更新。\n"
#: cmdline/apt-get.cc:2568
#, c-format
@@ -930,7 +935,7 @@ msgstr "在檢查編譯相依關係時必須至少指定一個套件"
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
-msgstr ""
+msgstr "沒有提供級 %s 之架構資訊。設置資料請見 apt.conf(5) APT::Architectures"
#: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820
#, c-format
@@ -995,11 +1000,11 @@ msgstr "無法處理編譯相依關係"
msgid "Changelog for %s (%s)"
msgstr "正和 %s (%s) 連線"
-#: cmdline/apt-get.cc:3368
+#: cmdline/apt-get.cc:3371
msgid "Supported modules:"
msgstr "已支援模組:"
-#: cmdline/apt-get.cc:3409
+#: cmdline/apt-get.cc:3412
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1085,13 +1090,17 @@ msgstr ""
"以取得更多資訊和選項。\n"
" 該 APT 有著超級牛力。\n"
-#: cmdline/apt-get.cc:3574
+#: cmdline/apt-get.cc:3577
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"注意:這只是模擬!\n"
+" apt-get 需要 root 權限才能真正執行。\n"
+" 並了解鎖定狀態未啟動,\n"
+" 因此未依附關聯於實際目前狀態!"
#: cmdline/acqprogress.cc:60
msgid "Hit "
@@ -1156,8 +1165,7 @@ msgid "%s was already not hold.\n"
msgstr "%s 已經是最新版本了。\n"
#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
@@ -1174,7 +1182,7 @@ msgstr "無法開啟 %s"
#: cmdline/apt-mark.cc:332
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "未能執行 dpkg。您是 root 使用者嗎?"
#: cmdline/apt-mark.cc:379
msgid ""
@@ -1293,8 +1301,8 @@ msgstr "連線逾時"
msgid "Server closed the connection"
msgstr "伺服器已關閉連線"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
-#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
+#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
msgid "Read error"
msgstr "讀取錯誤"
@@ -1307,8 +1315,8 @@ msgid "Protocol corruption"
msgstr "協定失敗"
#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
-#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
+#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
+#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
msgid "Write error"
msgstr "寫入錯誤"
@@ -1362,7 +1370,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法接受連線"
-#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311
+#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
msgid "Problem hashing file"
msgstr "有問題的雜湊檔"
@@ -1389,91 +1397,86 @@ msgstr "查詢"
msgid "Unable to invoke "
msgstr "無法 invoke "
-#: methods/connect.cc:76
+#: methods/connect.cc:75
#, c-format
msgid "Connecting to %s (%s)"
msgstr "正和 %s (%s) 連線"
-#: methods/connect.cc:87
+#: methods/connect.cc:86
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:94
+#: methods/connect.cc:93
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr "無法建立 socket 指向 %s (f=%u t=%u p=%u)"
-#: methods/connect.cc:100
+#: methods/connect.cc:99
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "無法初始和 %s:%s (%s) 的連線。"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "無法和 %s:%s (%s) 連線,連線逾時"
-#: methods/connect.cc:126
+#: methods/connect.cc:125
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "無法和 %s:%s (%s) 連線。"
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:433
#, c-format
msgid "Connecting to %s"
msgstr "正連線至 %s"
-#: methods/connect.cc:180 methods/connect.cc:199
+#: methods/connect.cc:172 methods/connect.cc:191
#, c-format
msgid "Could not resolve '%s'"
msgstr "無法解析 '%s'"
-#: methods/connect.cc:205
+#: methods/connect.cc:197
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "暫時無法解析 '%s'"
-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "在解析 '%s:%s' (%i) 時出了怪事"
-
-#: methods/connect.cc:211
+#: methods/connect.cc:200
#, fuzzy, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr "在解析 '%s:%s' (%i) 時出了怪事"
-#: methods/connect.cc:258
+#: methods/connect.cc:247
#, fuzzy, c-format
msgid "Unable to connect to %s:%s:"
msgstr "無法連線至 %s %s:"
-#: methods/gpgv.cc:169
+#: methods/gpgv.cc:180
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "內部錯誤:簽章無誤,但卻無法辨識密鑰的指紋碼?!"
-#: methods/gpgv.cc:174
+#: methods/gpgv.cc:185
msgid "At least one invalid signature was encountered."
msgstr "至少發現一個無效的簽章。"
-#: methods/gpgv.cc:178
+#: methods/gpgv.cc:189
#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr "無法執行 '%s' 來驗證簽章(gpgv 是否安裝了?)"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:194
msgid "Unknown error executing gpgv"
msgstr "在執行 gpgv 時發生未知的錯誤"
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
msgid "The following signatures were invalid:\n"
msgstr "以下簽名無效:\n"
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:242
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1481,7 +1484,7 @@ msgstr "由於無法取得它們的公鑰,以下簽章無法進行驗證:\n"
#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "空白檔不會是有效套件檔"
#: methods/http.cc:394
msgid "Waiting for headers"
@@ -1511,53 +1514,53 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題"
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:822
+#: methods/http.cc:818
msgid "Select failed"
msgstr "選擇失敗"
-#: methods/http.cc:827
+#: methods/http.cc:823
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:850
+#: methods/http.cc:846
msgid "Error writing to output file"
msgstr "在寫入輸出檔時發生錯誤"
-#: methods/http.cc:881
+#: methods/http.cc:877
msgid "Error writing to file"
msgstr "在寫入檔案時發生錯誤"
-#: methods/http.cc:909
+#: methods/http.cc:905
msgid "Error writing to the file"
msgstr "在寫入該檔時發生錯誤"
-#: methods/http.cc:923
+#: methods/http.cc:919
msgid "Error reading from server. Remote end closed connection"
msgstr "在讀取伺服器時發生錯誤,遠端主機已關閉連線"
-#: methods/http.cc:925
+#: methods/http.cc:921
msgid "Error reading from server"
msgstr "在讀取伺服器時發生錯誤"
-#: methods/http.cc:1198
+#: methods/http.cc:1194
msgid "Bad header data"
msgstr "錯誤的標頭資料"
-#: methods/http.cc:1215 methods/http.cc:1270
+#: methods/http.cc:1211 methods/http.cc:1266
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1362
+#: methods/http.cc:1358
msgid "Internal error"
msgstr "內部錯誤"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
+#: methods/mirror.cc:95 apt-inst/extract.cc:465
#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
+#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
#, c-format
msgid "Unable to read %s"
msgstr "無法讀取 %s"
@@ -1676,7 +1679,7 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1386
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339
#, c-format
msgid "Unable to write to %s"
msgstr "無法寫入 %s"
@@ -1819,8 +1822,8 @@ msgstr ""
msgid "Unable to open DB file %s: %s"
msgstr "無法開啟 DB 檔 %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
#, c-format
msgid "Failed to stat %s"
msgstr "無法取得 %s 的狀態"
@@ -1833,87 +1836,87 @@ msgstr "套件檔沒有 control 記錄"
msgid "Unable to get a cursor"
msgstr "無法取得遊標"
-#: ftparchive/writer.cc:82
+#: ftparchive/writer.cc:80
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "警告:無法讀取目錄 %s\n"
-#: ftparchive/writer.cc:87
+#: ftparchive/writer.cc:85
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "警告:無法取得 %s 狀態\n"
-#: ftparchive/writer.cc:143
+#: ftparchive/writer.cc:141
msgid "E: "
msgstr "錯誤:"
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:143
msgid "W: "
msgstr "警告:"
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:150
msgid "E: Errors apply to file "
msgstr "錯誤:套用到檔案時發生錯誤"
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
#, c-format
msgid "Failed to resolve %s"
msgstr "無法解析 %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:181
msgid "Tree walking failed"
msgstr "無法走訪目錄樹"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:208
#, c-format
msgid "Failed to open %s"
msgstr "無法開啟 %s"
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:267
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:275
#, c-format
msgid "Failed to readlink %s"
msgstr "無法讀取連結 %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:279
#, c-format
msgid "Failed to unlink %s"
msgstr "無法移除連結 %s"
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:286
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** 無法將 %s 連結到 %s"
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:296
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " 達到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:401
msgid "Archive had no package field"
msgstr "套件檔裡沒有套件資訊"
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:714
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 沒有重新定義項目\n"
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:858
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的維護者是 %s,而非 %s\n"
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:724
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 沒有原始碼重新定義項目\n"
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:728
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 也沒有二元碼重新定義項目\n"
@@ -1987,7 +1990,7 @@ msgstr "在計算 MD5 時無法讀取到資料"
msgid "Problem unlinking %s"
msgstr "在取消 %s 的連結時發生問題"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
#, c-format
msgid "Failed to rename %s to %s"
msgstr "無法將 %s 更名為 %s"
@@ -2131,54 +2134,54 @@ msgstr "寫入檔案 %s 失敗"
msgid "Failed to close file %s"
msgstr "關閉檔案 %s 失敗"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
#, c-format
msgid "The path %s is too long"
msgstr "路徑 %s 過長"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:127
#, c-format
msgid "Unpacking %s more than once"
msgstr "解開 %s 超過一次"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:137
#, c-format
msgid "The directory %s is diverted"
msgstr "路徑 %s 已被抽換"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:147
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "此套件試圖寫至抽換後的目標 %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
msgid "The diversion path is too long"
msgstr "要進行抽換的路徑過長"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr "目錄 %s 已經被非目錄的檔案所取代"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
msgstr "在雜湊表中找不到節點"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:287
msgid "The path is too long"
msgstr "路徑過長"
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "以無版本的 %s 覆寫原始套件"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492
#, c-format
msgid "Unable to stat %s"
msgstr "無法取得 %s 的狀態"
@@ -2250,38 +2253,38 @@ msgstr ""
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
-msgstr ""
+msgstr "無法增加 MMap 之大小,因已到達 %lu 位元組之限制。"
#: apt-pkg/contrib/mmap.cc:443
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+msgstr "無法增加 MMap 之大小,因自動增加大小已為用戶停用。"
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:372
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%li天%li小時%li分%li秒"
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:379
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%li小時%li分%li秒"
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:386
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%li分%li秒"
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:391
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%li秒"
-#: apt-pkg/contrib/strutl.cc:1172
+#: apt-pkg/contrib/strutl.cc:1167
#, c-format
msgid "Selection %s not found"
msgstr "選項 %s 找不到"
@@ -2351,16 +2354,6 @@ msgstr "%c%s... 錯誤!"
msgid "%c%s... Done"
msgstr "%c%s... 完成"
-#: apt-pkg/contrib/progress.cc:179
-msgid "..."
-msgstr ""
-
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 完成"
-
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
@@ -2444,23 +2437,23 @@ msgstr "無法將 %s 鎖定"
#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "無法建立檔案清單,因 '%s' 並非目錄"
#: apt-pkg/contrib/fileutl.cc:426
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "略過 '%2$s' 目錄的 '%1$s',因其並非普通檔案"
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgstr "略過 '%2$s' 目錄的 '%1$s' 檔案,因其並無檔案副檔名"
#: apt-pkg/contrib/fileutl.cc:453
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgstr "略過 '%2$s' 目錄的 '%1$s' 檔案,因其檔案副檔名無效"
#: apt-pkg/contrib/fileutl.cc:840
#, c-format
@@ -2472,69 +2465,63 @@ msgstr "子程序 %s 收到一個記憶體錯誤。"
msgid "Sub-process %s received signal %u."
msgstr "子程序 %s 收到一個記憶體錯誤。"
-#: apt-pkg/contrib/fileutl.cc:846 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子程序 %s 傳回錯誤碼 (%u)"
-#: apt-pkg/contrib/fileutl.cc:848 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:848
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子程序 %s 不預期得結束"
-#: apt-pkg/contrib/fileutl.cc:984
+#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
#, c-format
msgid "Could not open file %s"
msgstr "無法開啟檔案 %s"
-#: apt-pkg/contrib/fileutl.cc:1046
+#: apt-pkg/contrib/fileutl.cc:1066
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "無法開啟管線給 %s 使用"
-#: apt-pkg/contrib/fileutl.cc:1136
+#: apt-pkg/contrib/fileutl.cc:1156
msgid "Failed to create subprocess IPC"
msgstr "無法建立子程序 IPC"
-#: apt-pkg/contrib/fileutl.cc:1192
+#: apt-pkg/contrib/fileutl.cc:1212
msgid "Failed to exec compressor "
msgstr "無法執行壓縮程式"
-#: apt-pkg/contrib/fileutl.cc:1289
+#: apt-pkg/contrib/fileutl.cc:1309
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "讀取,仍有 %lu 未讀但已無空間"
-#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "寫入,仍有 %lu 待寫入但已沒辨法"
-#: apt-pkg/contrib/fileutl.cc:1716
+#: apt-pkg/contrib/fileutl.cc:1736
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "在關閉檔案時發生問題"
-#: apt-pkg/contrib/fileutl.cc:1728
+#: apt-pkg/contrib/fileutl.cc:1748
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "在同步檔案時發生問題"
-#: apt-pkg/contrib/fileutl.cc:1739
+#: apt-pkg/contrib/fileutl.cc:1759
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "在刪除檔案時發生問題"
-#: apt-pkg/contrib/fileutl.cc:1754
+#: apt-pkg/contrib/fileutl.cc:1774
msgid "Problem syncing the file"
msgstr "在同步檔案時發生問題"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "放棄安裝。"
-
#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "清空套件快取"
@@ -2561,59 +2548,59 @@ msgstr "本 APT 不支援 '%s' 版本系統"
msgid "The package cache was built for a different architecture"
msgstr "這個套件快取是用於另一種平台的"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Depends"
msgstr "相依關係"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "PreDepends"
msgstr "預先相依關係"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:305
msgid "Suggests"
msgstr "建議"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Recommends"
msgstr "推薦"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Conflicts"
msgstr "衝突"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:306
msgid "Replaces"
msgstr "取代"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Obsoletes"
msgstr "廢棄"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Breaks"
msgstr "毀損"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:307
msgid "Enhances"
-msgstr ""
+msgstr "增進"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "required"
msgstr "必要"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:318
msgid "standard"
msgstr "標準"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "optional"
msgstr "次要"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:319
msgid "extra"
msgstr "額外"
@@ -2713,12 +2700,12 @@ msgstr "正在開啟 %s"
msgid "Line %u too long in source list %s."
msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:289
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
@@ -2756,7 +2743,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "套件 %s 需要重新安裝,但找不到它的套件檔。"
-#: apt-pkg/algorithms.cc:1231
+#: apt-pkg/algorithms.cc:1228
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2764,11 +2751,11 @@ msgstr ""
"錯誤,pkgProblemResolver::Resolve 的建立中斷了,這可能肇因於保留 (hold) 套"
"件。"
-#: apt-pkg/algorithms.cc:1233
+#: apt-pkg/algorithms.cc:1230
msgid "Unable to correct problems, you have held broken packages."
msgstr "無法修正問題,您保留 (hold) 了損毀的套件。"
-#: apt-pkg/algorithms.cc:1583 apt-pkg/algorithms.cc:1585
+#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582
#, fuzzy
msgid ""
"Some index files failed to download. They have been ignored, or old ones "
@@ -2817,12 +2804,12 @@ msgstr "安裝方式 %s 沒有正確啟動"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中,然後按下 [Enter] 鍵。"
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:152
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支援的套件包裝系統 '%s'"
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:168
msgid "Unable to determine a suitable packaging system type"
msgstr "無法確認合適的套件包裝系統類型"
@@ -2875,14 +2862,14 @@ msgstr "快取使用的是不相容的版本系統"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:319
-#: apt-pkg/pkgcachegen.cc:332 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:378 apt-pkg/pkgcachegen.cc:395
-#: apt-pkg/pkgcachegen.cc:403 apt-pkg/pkgcachegen.cc:407
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:432
-#: apt-pkg/pkgcachegen.cc:471 apt-pkg/pkgcachegen.cc:509
-#: apt-pkg/pkgcachegen.cc:516 apt-pkg/pkgcachegen.cc:547
-#: apt-pkg/pkgcachegen.cc:561
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "在處理 %s 時發生錯誤 (FindPkg)"
@@ -2903,26 +2890,26 @@ msgstr "哇呀,您已經超過這個 APT 所能處理的說明數量了。"
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr "哇呀,您已經超過這個 APT 所能處理的相依關係數量了。"
-#: apt-pkg/pkgcachegen.cc:568
+#: apt-pkg/pkgcachegen.cc:577
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "在計算檔案相依性時找不到套件 %s %s"
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1150
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "無法取得來源套件列表 %s 的狀態"
-#: apt-pkg/pkgcachegen.cc:1285 apt-pkg/pkgcachegen.cc:1389
-#: apt-pkg/pkgcachegen.cc:1395 apt-pkg/pkgcachegen.cc:1552
+#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342
+#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505
msgid "Reading package lists"
msgstr "正在讀取套件清單"
-#: apt-pkg/pkgcachegen.cc:1302
+#: apt-pkg/pkgcachegen.cc:1255
msgid "Collecting File Provides"
msgstr "正在收集檔案提供者"
-#: apt-pkg/pkgcachegen.cc:1494 apt-pkg/pkgcachegen.cc:1501
+#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454
msgid "IO Error saving source cache"
msgstr "在儲存來源快取時 IO 錯誤"
@@ -2935,53 +2922,53 @@ msgstr "無法重新命名,%s (%s -> %s)。"
msgid "MD5Sum mismatch"
msgstr "MD5Sum 不符"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1865
-#: apt-pkg/acquire-item.cc:2008
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
+#: apt-pkg/acquire-item.cc:2013
msgid "Hash Sum mismatch"
msgstr "Hash Sum 不符"
-#: apt-pkg/acquire-item.cc:1370
+#: apt-pkg/acquire-item.cc:1381
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1386
+#: apt-pkg/acquire-item.cc:1397
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/acquire-item.cc:1428
+#: apt-pkg/acquire-item.cc:1439
msgid "There is no public key available for the following key IDs:\n"
msgstr "無法取得以下的密鑰 ID 的公鑰:\n"
-#: apt-pkg/acquire-item.cc:1466
+#: apt-pkg/acquire-item.cc:1477
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1488
+#: apt-pkg/acquire-item.cc:1499
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "發行版本衝突:%s(應當是 %s 但卻得到 %s)"
-#: apt-pkg/acquire-item.cc:1518
+#: apt-pkg/acquire-item.cc:1532
#, c-format
msgid ""
-"An error occurred during the signature verification. The repository is not "
+"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1528 apt-pkg/acquire-item.cc:1533
+#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
#, c-format
msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "GPG 錯誤: %s: %s"
-#: apt-pkg/acquire-item.cc:1641
+#: apt-pkg/acquire-item.cc:1646
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2990,44 +2977,44 @@ msgstr ""
"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。(因為找不到平"
"台)"
-#: apt-pkg/acquire-item.cc:1700
+#: apt-pkg/acquire-item.cc:1705
#, 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."
msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。"
-#: apt-pkg/acquire-item.cc:1759
+#: apt-pkg/acquire-item.cc:1764
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
-#: apt-pkg/acquire-item.cc:1857
+#: apt-pkg/acquire-item.cc:1862
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:64
#, c-format
msgid "Unable to parse Release file %s"
msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:74
#, c-format
msgid "No sections in Release file %s"
msgstr "在 Release 檔 %s 裡沒有區段"
-#: apt-pkg/indexrecords.cc:112
+#: apt-pkg/indexrecords.cc:108
#, c-format
msgid "No Hash entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:121
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/indexrecords.cc:144
+#: apt-pkg/indexrecords.cc:140
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
@@ -3091,7 +3078,7 @@ msgstr "找到了 %zu 個套件索引,%zu 個原始碼索引,%zu 個翻譯
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
-msgstr ""
+msgstr "找不到套件檔,可能此並非 Debian 光碟或平台不對?"
#: apt-pkg/cdrom.cc:782
#, c-format
@@ -3123,22 +3110,22 @@ msgstr "正在寫入新的來源列表\n"
msgid "Source list entries for this disc are:\n"
msgstr "該碟片的來源列表項目為:\n"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:764
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
#, c-format
msgid "Wrote %i records.\n"
msgstr "寫入 %i 筆紀錄。\n"
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:766
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了。\n"
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:769
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案不符\n"
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:772
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "寫入 %i 筆紀綠,其中有 %i 個檔案遺失了,有 %i 個檔案不符\n"
@@ -3153,6 +3140,17 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum 不符"
+#: apt-pkg/indexcopy.cc:662
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:692
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "放棄安裝。"
+
#: apt-pkg/cacheset.cc:403
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -3176,7 +3174,7 @@ msgstr "無法找到套件 %s"
#: apt-pkg/cacheset.cc:534
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgstr "無法選取 %s 套件的版本,因其為純虛擬套件"
#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
#, c-format
@@ -3216,119 +3214,119 @@ msgstr ""
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Installing %s"
msgstr "正在安裝 %s"
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
#, c-format
msgid "Configuring %s"
msgstr "正在設定 %s"
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
#, c-format
msgid "Removing %s"
msgstr "正在移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:75
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:76
#, c-format
msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "剛注意到 %s 消失"
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:77
#, c-format
msgid "Running post-installation trigger %s"
msgstr "正在執行安裝後套件後續處理程式 %s"
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:705
+#: apt-pkg/deb/dpkgpm.cc:704
#, c-format
msgid "Directory '%s' missing"
msgstr "找不到 '%s' 目錄"
-#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
+#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "無法開啟檔案 %s"
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:944
#, c-format
msgid "Preparing %s"
msgstr "正在準備 %s"
-#: apt-pkg/deb/dpkgpm.cc:946
+#: apt-pkg/deb/dpkgpm.cc:945
#, c-format
msgid "Unpacking %s"
msgstr "正在解開 %s"
-#: apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:950
#, c-format
msgid "Preparing to configure %s"
msgstr "正在準備設定 %s"
-#: apt-pkg/deb/dpkgpm.cc:953
+#: apt-pkg/deb/dpkgpm.cc:952
#, c-format
msgid "Installed %s"
msgstr "已安裝 %s"
-#: apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:957
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在準備移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:960
+#: apt-pkg/deb/dpkgpm.cc:959
#, c-format
msgid "Removed %s"
msgstr "已移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:964
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在準備完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:966
+#: apt-pkg/deb/dpkgpm.cc:965
#, c-format
msgid "Completely removed %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:1213
+#: apt-pkg/deb/dpkgpm.cc:1212
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "無法寫入記錄檔,openpty() 失敗(/dev/pts 未掛載?)\n"
-#: apt-pkg/deb/dpkgpm.cc:1243
+#: apt-pkg/deb/dpkgpm.cc:1242
msgid "Running dpkg"
-msgstr ""
+msgstr "執行 dpkg"
-#: apt-pkg/deb/dpkgpm.cc:1415
+#: apt-pkg/deb/dpkgpm.cc:1414
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1476
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1482
+#: apt-pkg/deb/dpkgpm.cc:1481
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "依存關係問題 - 維持為未設定"
-#: apt-pkg/deb/dpkgpm.cc:1484
+#: apt-pkg/deb/dpkgpm.cc:1483
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1490
+#: apt-pkg/deb/dpkgpm.cc:1489
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
@@ -3340,7 +3338,13 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1503
+#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1530
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3363,11 +3367,19 @@ msgstr "無法鎖定列表目錄"
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
+msgstr "dpkg 作業遭中斷,必須手動執行 '%s' 以修正問題。 "
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
-msgstr ""
+msgstr "未鎖定"
+
+#, fuzzy
+#~ msgid "System error resolving '%s:%s'"
+#~ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
+
+#, fuzzy
+#~ msgid "%c%s... %u%%"
+#~ msgstr "%c%s... 完成"
#, fuzzy
#~ msgid "Skipping nonexistent file %s"
diff --git a/prepare-release b/prepare-release
index 73c0be602..8cf4ccace 100755
--- a/prepare-release
+++ b/prepare-release
@@ -1,11 +1,15 @@
#!/bin/sh
+set -e
+
VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p')
DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p')
LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')"
LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
+dpkg-checkbuilddeps -d 'libxml2-utils'
+
if [ "$1" = 'pre-export' ]; then
libraryversioncheck() {
local LIBRARY="$1"
diff --git a/share/apt-auth-failure.note b/share/apt-auth-failure.note
new file mode 100644
index 000000000..3e8a9e71d
--- /dev/null
+++ b/share/apt-auth-failure.note
@@ -0,0 +1,11 @@
+_Name: Apt Authentication issue
+Priority: High
+Terminal: False
+Command: gksu -- synaptic --non-interactive --update-at-startup --hide-main-window
+GettextDomain: apt
+_Description: Problem during package list update.
+ The package list update failed with a authentication failure.
+ This usually happens behind a network proxy server. Please try
+ to click on the "Run this action now" button to correct the problem or
+ update the list manually by running Update Manager and clicking
+ on "Check".
diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg
new file mode 100644
index 000000000..2ce60d454
--- /dev/null
+++ b/share/ubuntu-archive.gpg
Binary files differ
diff --git a/test/integration/exploid-keyring-with-dupe-keys.pub b/test/integration/exploid-keyring-with-dupe-keys.pub
new file mode 100644
index 000000000..642952a40
--- /dev/null
+++ b/test/integration/exploid-keyring-with-dupe-keys.pub
Binary files differ
diff --git a/test/integration/exploid-keyring-with-dupe-subkeys.pub b/test/integration/exploid-keyring-with-dupe-subkeys.pub
new file mode 100644
index 000000000..02d4e6ee8
--- /dev/null
+++ b/test/integration/exploid-keyring-with-dupe-subkeys.pub
Binary files differ
diff --git a/test/integration/framework b/test/integration/framework
index 31b12e8bf..9b01c3161 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -707,20 +707,30 @@ signreleasefiles() {
}
changetowebserver() {
- if which weborf > /dev/null; then
- weborf -xb aptarchive/ 2>&1 > /dev/null &
+ if [ -n "$1" ] && ! test -x ${BUILDDIRECTORY}/aptwebserver; then
+ msgdie 'Need the aptwebserver when passing arguments'
+ fi
+
+ local LOG='/dev/null'
+ if test -x ${BUILDDIRECTORY}/aptwebserver; then
+ cd aptarchive
+ LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> $LOG > $LOG &
+ addtrap "kill $!;"
+ cd - > /dev/null
+ elif which weborf > /dev/null; then
+ weborf -xb aptarchive/ 2> $LOG > $LOG &
addtrap "kill $!;"
elif which gatling > /dev/null; then
cd aptarchive
- gatling -p 8080 -F -S 2>&1 > /dev/null &
+ gatling -p 8080 -F -S 2> $LOG > $LOG &
addtrap "kill $!;"
cd - > /dev/null
elif which lighttpd > /dev/null; then
echo "server.document-root = \"$(readlink -f ./aptarchive)\"
server.port = 8080
server.stat-cache-engine = \"disable\"" > lighttpd.conf
- lighttpd -t -f lighttpd.conf >/dev/null || msgdie 'Can not change to webserver: our lighttpd config is invalid'
- lighttpd -D -f lighttpd.conf 2>/dev/null >/dev/null &
+ lighttpd -t -f lighttpd.conf 2> $LOG > $LOG || msgdie 'Can not change to webserver: our lighttpd config is invalid'
+ lighttpd -D -f lighttpd.conf 2> $LOG > $LOG &
addtrap "kill $!;"
else
msgdie 'You have to install weborf or lighttpd first'
diff --git a/test/integration/skip-aptwebserver b/test/integration/skip-aptwebserver
new file mode 100755
index 000000000..0622941ce
--- /dev/null
+++ b/test/integration/skip-aptwebserver
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
+
+setupaptarchive
+changetowebserver
+
+rm -rf rootdir/var/lib/apt/lists
+aptget update -qq
+testequal 'Hit http://localhost stable InRelease
+Hit http://localhost stable/main Sources
+Hit http://localhost stable/main amd64 Packages
+Hit http://localhost stable/main Translation-en
+Reading package lists...' aptget update
+
+mv rootdir/var/lib/apt/lists/localhost* rootdir/var/lib/apt/lists/partial
+aptget update
+
diff --git a/test/integration/skip-bug-602412-dequote-redirect b/test/integration/skip-bug-602412-dequote-redirect
deleted file mode 100755
index 689b671ce..000000000
--- a/test/integration/skip-bug-602412-dequote-redirect
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-set -e
-
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
-setupenvironment
-configarchitecture 'i386'
-
-if ! which lighttpd > /dev/null; then
- msgdie 'You need lighttpd for this testcase, sorry…'
- exit 1
-fi
-
-buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable'
-
-setupaptarchive
-
-echo "server.modules = ( \"mod_redirect\" )
-server.document-root = \"$(readlink -f ./aptarchive)\"
-server.port = 8080
-server.stat-cache-engine = \"disable\"
-url.redirect = ( \"^/pool/(.*)$\" => \"/newpool/\$1\",
- \"^/dists/(.*)$\" => \"/newdists/\$1\" )" > lighttpd.conf
-
-mv aptarchive/pool aptarchive/newpool
-mv aptarchive/dists aptarchive/newdists
-
-lighttpd -t -f lighttpd.conf >/dev/null || msgdie 'Can not change to webserver: our lighttpd config is invalid'
-lighttpd -D -f lighttpd.conf 2>/dev/null >/dev/null &
-addtrap "kill $!;"
-
-APTARCHIVE="file://$(readlink -f ./aptarchive)"
-for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do
- sed -i $LIST -e "s#$APTARCHIVE#http://localhost:8080/#"
-done
-
-aptget update || msgdie 'apt-get update failed'
-aptget install unrelated --download-only || msgdie 'downloading package failed'
diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
new file mode 100755
index 000000000..d5205836f
--- /dev/null
+++ b/test/integration/test-apt-key-net-update
@@ -0,0 +1,95 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture "i386"
+
+# mock
+requires_root() {
+ return 0
+}
+
+# extract net_update() and import it
+func=$( sed -n -e '/^add_keys_with_verify_against_master_keyring/,/^}/p' ${BUILDDIRECTORY}/apt-key )
+eval "$func"
+
+mkdir -p ./etc/apt
+TRUSTEDFILE=./etc/apt/trusted.gpg
+mkdir -p ./var/lib/apt/keyrings
+TMP_KEYRING=./var/lib/apt/keyrings/maybe-import-keyring.gpg
+GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring"
+GPG="$GPG_CMD --keyring $TRUSTEDFILE"
+MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
+
+
+msgtest "add_keys_with_verify_against_master_keyring"
+if [ ! -e $MASTER_KEYRING ]; then
+ echo -n "No $MASTER_KEYRING found"
+ msgskip
+ exit 0
+fi
+
+# test bad keyring and ensure its not added (LP: #857472)
+ADD_KEYRING=./keys/exploid-keyring-with-dupe-keys.pub
+if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
+ msgfail
+else
+ msgpass
+fi
+
+# ensure the keyring is still empty
+gpg_out=$($GPG --list-keys)
+msgtest "Test if keyring is empty"
+if [ -n "" ]; then
+ msgfail
+else
+ msgpass
+fi
+
+
+# test another possible attack vector using subkeys (LP: #1013128)
+msgtest "add_keys_with_verify_against_master_keyring with subkey attack"
+ADD_KEYRING=./keys/exploid-keyring-with-dupe-subkeys.pub
+if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
+ msgfail
+else
+ msgpass
+fi
+
+# ensure the keyring is still empty
+gpg_out=$($GPG --list-keys)
+msgtest "Test if keyring is empty"
+if [ -n "" ]; then
+ msgfail
+else
+ msgpass
+fi
+
+
+# test good keyring and ensure we get no errors
+ADD_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+if add_keys_with_verify_against_master_keyring $ADD_KEYRING $MASTER_KEYRING; then
+ msgpass
+else
+ msgfail
+fi
+
+testequal './etc/apt/trusted.gpg
+---------------------
+pub 1024D/437D05B5 2004-09-12
+uid Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>
+sub 2048g/79164387 2004-09-12
+
+pub 1024D/FBB75451 2004-12-30
+uid Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>
+
+pub 4096R/C0B21F32 2012-05-11
+uid Ubuntu Archive Automatic Signing Key (2012) <ftpmaster@ubuntu.com>
+
+pub 4096R/EFE21092 2012-05-11
+uid Ubuntu CD Image Automatic Signing Key (2012) <cdimage@ubuntu.com>
+' $GPG --list-keys
+
diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
new file mode 100755
index 000000000..43ecda867
--- /dev/null
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -0,0 +1,30 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable'
+
+setupaptarchive
+changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \
+ -o aptwebserver::redirect::replace::/dists/=/newdists/
+
+mv aptarchive/pool aptarchive/newpool
+mv aptarchive/dists aptarchive/newdists
+
+msgtest 'Test redirection works in' 'apt-get update'
+aptget update -qq && msgpass || msgfail
+
+# check that I-M-S header is kept in redirections
+testequal 'Hit http://localhost unstable Release.gpg
+Hit http://localhost unstable Release
+Hit http://localhost unstable/main Sources
+Hit http://localhost unstable/main amd64 Packages
+Hit http://localhost unstable/main Translation-en
+Reading package lists...' aptget update
+
+msgtest 'Test redirection works in' 'package download'
+aptget install unrelated --download-only -qq && msgpass || msgfail
diff --git a/test/integration/test-bug-666772-multiarch-arch-all-build-deps b/test/integration/test-bug-666772-multiarch-arch-all-build-deps
new file mode 100755
index 000000000..cfae1fef3
--- /dev/null
+++ b/test/integration/test-bug-666772-multiarch-arch-all-build-deps
@@ -0,0 +1,118 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'armhf'
+
+insertinstalledpackage 'build-essential' 'all' '11.5'
+
+insertpackage 'unstable' 'doxygen' 'all' '1.0' 'Depends: language-support, language-tool'
+insertpackage 'unstable' 'libc6' 'amd64,armhf' '1.0' 'Multi-Arch: same'
+insertpackage 'unstable' 'libc6-dev' 'amd64,armhf' '1.0' 'Depends: libc6
+Multi-Arch: same'
+insertpackage 'unstable' 'language-support' 'amd64,armhf' '1.0' 'Multi-Arch: foreign'
+insertpackage 'unstable' 'language-tool' 'amd64,armhf' '1.0'
+
+insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-support language-tool libc6 libc6-dev
+0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded.
+Inst language-support (1.0 unstable [amd64])
+Inst language-tool (1.0 unstable [amd64])
+Inst doxygen (1.0 unstable [all])
+Inst libc6 (1.0 unstable [amd64])
+Inst libc6-dev (1.0 unstable [amd64])
+Conf language-support (1.0 unstable [amd64])
+Conf language-tool (1.0 unstable [amd64])
+Conf doxygen (1.0 unstable [all])
+Conf libc6 (1.0 unstable [amd64])
+Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-support language-tool libc6:armhf libc6-dev:armhf
+0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded.
+Inst language-support (1.0 unstable [amd64])
+Inst language-tool (1.0 unstable [amd64])
+Inst doxygen (1.0 unstable [all])
+Inst libc6:armhf (1.0 unstable [armhf])
+Inst libc6-dev:armhf (1.0 unstable [armhf])
+Conf language-support (1.0 unstable [amd64])
+Conf language-tool (1.0 unstable [amd64])
+Conf doxygen (1.0 unstable [all])
+Conf libc6:armhf (1.0 unstable [armhf])
+Conf libc6-dev:armhf (1.0 unstable [armhf])' aptget build-dep apt -s -a armhf
+
+configarchitecture 'armhf' 'amd64'
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-support language-tool libc6 libc6-dev
+0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded.
+Inst language-support (1.0 unstable [armhf])
+Inst language-tool (1.0 unstable [armhf])
+Inst doxygen (1.0 unstable [all])
+Inst libc6 (1.0 unstable [armhf])
+Inst libc6-dev (1.0 unstable [armhf])
+Conf language-support (1.0 unstable [armhf])
+Conf language-tool (1.0 unstable [armhf])
+Conf doxygen (1.0 unstable [all])
+Conf libc6 (1.0 unstable [armhf])
+Conf libc6-dev (1.0 unstable [armhf])' aptget build-dep apt -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-support language-tool libc6:amd64 libc6-dev:amd64
+0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded.
+Inst language-support (1.0 unstable [armhf])
+Inst language-tool (1.0 unstable [armhf])
+Inst doxygen (1.0 unstable [all])
+Inst libc6:amd64 (1.0 unstable [amd64])
+Inst libc6-dev:amd64 (1.0 unstable [amd64])
+Conf language-support (1.0 unstable [armhf])
+Conf language-tool (1.0 unstable [armhf])
+Conf doxygen (1.0 unstable [all])
+Conf libc6:amd64 (1.0 unstable [amd64])
+Conf libc6-dev:amd64 (1.0 unstable [amd64])' aptget build-dep apt -s -a amd64
+
+configarchitecture 'amd64' 'armhf'
+
+insertinstalledpackage 'language-support' 'armhf' '0.5' 'Multi-Arch: foreign'
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-tool libc6 libc6-dev
+0 upgraded, 4 newly installed, 0 to remove and 1 not upgraded.
+Inst language-tool (1.0 unstable [amd64])
+Inst doxygen (1.0 unstable [all])
+Inst libc6 (1.0 unstable [amd64])
+Inst libc6-dev (1.0 unstable [amd64])
+Conf language-tool (1.0 unstable [amd64])
+Conf doxygen (1.0 unstable [all])
+Conf libc6 (1.0 unstable [amd64])
+Conf libc6-dev (1.0 unstable [amd64])' aptget build-dep apt -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ doxygen language-tool libc6:armhf libc6-dev:armhf
+0 upgraded, 4 newly installed, 0 to remove and 1 not upgraded.
+Inst language-tool (1.0 unstable [amd64])
+Inst doxygen (1.0 unstable [all])
+Inst libc6:armhf (1.0 unstable [armhf])
+Inst libc6-dev:armhf (1.0 unstable [armhf])
+Conf language-tool (1.0 unstable [amd64])
+Conf doxygen (1.0 unstable [all])
+Conf libc6:armhf (1.0 unstable [armhf])
+Conf libc6-dev:armhf (1.0 unstable [armhf])' aptget build-dep apt -s -a armhf
diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove
new file mode 100755
index 000000000..ffcd3963a
--- /dev/null
+++ b/test/integration/test-kernel-helper-autoremove
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+set -e
+
+# setup testdir
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+TMPDIR=$(mktemp -d)
+cd $TMPDIR
+addtrap "cd /; rm -rf $TMPDIR"
+
+# create mock environment
+mkdir apt.conf.d
+cat > aptconfig.conf <<EOF
+Dir::Etc::parts "$TMPDIR/apt.conf.d";
+Dir::bin::dpkg "$TMPDIR/fake-dpkg";
+EOF
+APT_CONFIG=aptconfig.conf
+export APT_CONFIG
+
+# install fake-dpkg into it
+install -m755 $TESTDIR/test-kernel-helper-autoremove.fake-dpkg $TMPDIR/fake-dpkg
+
+# run the helper
+sh ${TESTDIR}/../../debian/apt.auto-removal.sh
+
+msgtest 'Check that kernel autoremoval list is correctly created'
+# and ensure its there, valid and version 10.0.0-1 is there too
+test -e $TMPDIR/apt.conf.d/01autoremove-kernels && msgpass || msgfail
+
+msgtest 'Check that most recent kernel is saved from autoremoval'
+apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" && msgpass || msgfail
+
+# ... and also that the running kernel is excluded
+msgtest 'Check that running kernel is saved from autoremoval'
+apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" && msgpass || msgfail
+
+# and that the old kernel is *not* excluded from autoremoval
+msgtest 'Check that older kernels are not excluded from autoremoval'
+apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic\.\*" && msgfail || msgpass
+
+msgtest "Check that the older kernel is retained when it's being installed"
+sh ${TESTDIR}/../../debian/apt.auto-removal.sh 1.0.01-2-generic
+test -e $TMPDIR/apt.conf.d/01autoremove-kernels
+if ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-10.0.0-1-generic\.\*" \
+ || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-$(uname -r)\.\*" \
+ || ! apt-config -c ${APT_CONFIG} dump|grep -q "APT::NeverAutoRemove::.*\^linux-image-1\.0\.01-2-generic\.\*"
+then
+ msgfail
+else
+ msgpass
+fi
+
+# done
diff --git a/test/integration/test-kernel-helper-autoremove.fake-dpkg b/test/integration/test-kernel-helper-autoremove.fake-dpkg
new file mode 100644
index 000000000..a365c5370
--- /dev/null
+++ b/test/integration/test-kernel-helper-autoremove.fake-dpkg
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "-l" ]; then
+ echo "ii linux-image-1.0.0-2-generic 1.0.01-2 amd64"
+ echo "ii linux-image-$(uname -r) not-used amd64"
+ echo "ii linux-image-10.0.0-1-generic 10.0.0.1-1 amd64"
+elif [ "$1" = "--compare-versions" ]; then
+ dpkg "$1" "$2" "$3" "$4"
+else
+ dpkg $@
+fi
+
diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
new file mode 100755
index 000000000..25cccf067
--- /dev/null
+++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
@@ -0,0 +1,47 @@
+#!/bin/sh
+set -e
+
+ensure_n_canary_strings_in_dir() {
+ DIR=$1
+ CANARY_STRING=$2
+ EXPECTED_N=$3
+
+ msgtest "Testing for $EXPECTED_N canary strings '$CANARY_STRING' in in" "$DIR"
+
+ N=$(grep "$CANARY_STRING" $DIR/* 2>/dev/null |wc -l )
+ if [ "$N" = "$EXPECTED_N" ]; then
+ msgpass
+ return 0
+ else
+ msgfail "Expected $EXPECTED_N canaries, got $N"
+ return 1
+ fi
+}
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'native'
+
+insertpackage 'unstable' 'unrelated' 'all' '1.0' 'stable'
+
+setupaptarchive
+changetowebserver --simulate-paywall
+
+rm -rf rootdir/var/lib/apt/lists
+msgtest 'excpected failure of' 'apt-get update'
+aptget update -qq 2>/dev/null && msgfail || msgpass
+
+ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ 'ni ni ni' 0
+testequal 'partial' ls rootdir/var/lib/apt/lists/
+
+# again, this time with pre-existing files valid data
+for f in Release Release.gpg main_binary-amd64_Packages stable_main_source_Sources; do
+ echo "canary" > rootdir/var/lib/apt/lists/localhost:8080_dists_stable_${f}
+done
+
+# this will fail, the important part is that the canaries remain
+msgtest 'excpected failure of' 'apt-get update'
+aptget update -qq 2>/dev/null && msgfail || msgpass
+ensure_n_canary_strings_in_dir rootdir/var/lib/apt/lists/ 'canary' 4
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
new file mode 100644
index 000000000..ff60d64a3
--- /dev/null
+++ b/test/interactive-helper/aptwebserver.cc
@@ -0,0 +1,513 @@
+#include <config.h>
+
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/init.h>
+
+#include <vector>
+#include <string>
+#include <list>
+#include <sstream>
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#include <errno.h>
+#include <time.h>
+#include <stdlib.h>
+#include <dirent.h>
+#include <signal.h>
+
+char const * const httpcodeToStr(int const httpcode) { /*{{{*/
+ switch (httpcode) {
+ // Informational 1xx
+ case 100: return "100 Continue";
+ case 101: return "101 Switching Protocols";
+ // Successful 2xx
+ case 200: return "200 OK";
+ case 201: return "201 Created";
+ case 202: return "202 Accepted";
+ case 203: return "203 Non-Authoritative Information";
+ case 204: return "204 No Content";
+ case 205: return "205 Reset Content";
+ case 206: return "206 Partial Content";
+ // Redirections 3xx
+ case 300: return "300 Multiple Choices";
+ case 301: return "301 Moved Permanently";
+ case 302: return "302 Found";
+ case 303: return "303 See Other";
+ case 304: return "304 Not Modified";
+ case 305: return "304 Use Proxy";
+ case 307: return "307 Temporary Redirect";
+ // Client errors 4xx
+ case 400: return "400 Bad Request";
+ case 401: return "401 Unauthorized";
+ case 402: return "402 Payment Required";
+ case 403: return "403 Forbidden";
+ case 404: return "404 Not Found";
+ case 405: return "405 Method Not Allowed";
+ case 406: return "406 Not Acceptable";
+ case 407: return "407 Proxy Authentication Required";
+ case 408: return "408 Request Time-out";
+ case 409: return "409 Conflict";
+ case 410: return "410 Gone";
+ case 411: return "411 Length Required";
+ case 412: return "412 Precondition Failed";
+ case 413: return "413 Request Entity Too Large";
+ case 414: return "414 Request-URI Too Large";
+ case 415: return "415 Unsupported Media Type";
+ case 416: return "416 Requested range not satisfiable";
+ case 417: return "417 Expectation Failed";
+ // Server error 5xx
+ case 500: return "500 Internal Server Error";
+ case 501: return "501 Not Implemented";
+ case 502: return "502 Bad Gateway";
+ case 503: return "503 Service Unavailable";
+ case 504: return "504 Gateway Time-out";
+ case 505: return "505 HTTP Version not supported";
+ }
+ return NULL;
+}
+ /*}}}*/
+void addFileHeaders(std::list<std::string> &headers, FileFd &data) { /*{{{*/
+ std::ostringstream contentlength;
+ contentlength << "Content-Length: " << data.FileSize();
+ headers.push_back(contentlength.str());
+
+ std::string lastmodified("Last-Modified: ");
+ lastmodified.append(TimeRFC1123(data.ModificationTime()));
+ headers.push_back(lastmodified);
+
+ std::string const fileext = flExtension(data.Name());
+ if (fileext.empty() == false && fileext != data.Name()) {
+ std::string confcontenttype("aptwebserver::ContentType::");
+ confcontenttype.append(fileext);
+ std::string const contenttype = _config->Find(confcontenttype);
+ if (contenttype.empty() == false) {
+ std::string header("Content-Type: ");
+ header.append(contenttype);
+ headers.push_back(header);
+ }
+ }
+}
+ /*}}}*/
+void addDataHeaders(std::list<std::string> &headers, std::string &data) {/*{{{*/
+ std::ostringstream contentlength;
+ contentlength << "Content-Length: " << data.size();
+ headers.push_back(contentlength.str());
+}
+ /*}}}*/
+bool sendHead(int const client, int const httpcode, std::list<std::string> &headers) { /*{{{*/
+ std::string response("HTTP/1.1 ");
+ response.append(httpcodeToStr(httpcode));
+ headers.push_front(response);
+
+ headers.push_back("Server: APT webserver");
+
+ std::string date("Date: ");
+ date.append(TimeRFC1123(time(NULL)));
+ headers.push_back(date);
+
+ headers.push_back("Accept-Ranges: bytes");
+
+ std::clog << ">>> RESPONSE >>>" << std::endl;
+ bool Success = true;
+ for (std::list<std::string>::const_iterator h = headers.begin();
+ Success == true && h != headers.end(); ++h) {
+ Success &= FileFd::Write(client, h->c_str(), h->size());
+ if (Success == true)
+ Success &= FileFd::Write(client, "\r\n", 2);
+ std::clog << *h << std::endl;
+ }
+ if (Success == true)
+ Success &= FileFd::Write(client, "\r\n", 2);
+ std::clog << "<<<<<<<<<<<<<<<<" << std::endl;
+ return Success;
+}
+ /*}}}*/
+bool sendFile(int const client, FileFd &data) { /*{{{*/
+ bool Success = true;
+ char buffer[500];
+ unsigned long long actual = 0;
+ while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true) {
+ if (actual == 0)
+ break;
+ if (Success == true)
+ Success &= FileFd::Write(client, buffer, actual);
+ }
+ if (Success == true)
+ Success &= FileFd::Write(client, "\r\n", 2);
+ return Success;
+}
+ /*}}}*/
+bool sendData(int const client, std::string const &data) { /*{{{*/
+ bool Success = true;
+ Success &= FileFd::Write(client, data.c_str(), data.size());
+ if (Success == true)
+ Success &= FileFd::Write(client, "\r\n", 2);
+ return Success;
+}
+ /*}}}*/
+void sendError(int const client, int const httpcode, std::string const &request, bool content, std::string const &error = "") { /*{{{*/
+ std::list<std::string> headers;
+ std::string response("<html><head><title>");
+ response.append(httpcodeToStr(httpcode)).append("</title></head>");
+ response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1>");
+ if (error.empty() == false)
+ response.append("<p><em>Error</em>: ").append(error).append("</p>");
+ response.append("This error is a result of the request: <pre>");
+ response.append(request).append("</pre></body></html>");
+ addDataHeaders(headers, response);
+ sendHead(client, httpcode, headers);
+ if (content == true)
+ sendData(client, response);
+}
+ /*}}}*/
+void sendRedirect(int const client, int const httpcode, std::string const &uri, std::string const &request, bool content) { /*{{{*/
+ std::list<std::string> headers;
+ std::string response("<html><head><title>");
+ response.append(httpcodeToStr(httpcode)).append("</title></head>");
+ response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1");
+ response.append("<p>You should be redirected to <em>").append(uri).append("</em></p>");
+ response.append("This page is a result of the request: <pre>");
+ response.append(request).append("</pre></body></html>");
+ addDataHeaders(headers, response);
+ std::string location("Location: ");
+ if (strncmp(uri.c_str(), "http://", 7) != 0)
+ location.append("http://").append(LookupTag(request, "Host")).append("/").append(uri);
+ else
+ location.append(uri);
+ headers.push_back(location);
+ sendHead(client, httpcode, headers);
+ if (content == true)
+ sendData(client, response);
+}
+ /*}}}*/
+// sendDirectoryLisiting /*{{{*/
+int filter_hidden_files(const struct dirent *a) {
+ if (a->d_name[0] == '.')
+ return 0;
+#ifdef _DIRENT_HAVE_D_TYPE
+ // if we have the d_type check that only files and dirs will be included
+ if (a->d_type != DT_UNKNOWN &&
+ a->d_type != DT_REG &&
+ a->d_type != DT_LNK && // this includes links to regular files
+ a->d_type != DT_DIR)
+ return 0;
+#endif
+ return 1;
+}
+int grouped_alpha_case_sort(const struct dirent **a, const struct dirent **b) {
+#ifdef _DIRENT_HAVE_D_TYPE
+ if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_DIR);
+ else if ((*a)->d_type == DT_DIR && (*b)->d_type == DT_REG)
+ return -1;
+ else if ((*b)->d_type == DT_DIR && (*a)->d_type == DT_REG)
+ return 1;
+ else
+#endif
+ {
+ struct stat f_prop; //File's property
+ stat((*a)->d_name, &f_prop);
+ int const amode = f_prop.st_mode;
+ stat((*b)->d_name, &f_prop);
+ int const bmode = f_prop.st_mode;
+ if (S_ISDIR(amode) && S_ISDIR(bmode));
+ else if (S_ISDIR(amode))
+ return -1;
+ else if (S_ISDIR(bmode))
+ return 1;
+ }
+ return strcasecmp((*a)->d_name, (*b)->d_name);
+}
+void sendDirectoryListing(int const client, std::string const &dir, std::string const &request, bool content) {
+ std::list<std::string> headers;
+ std::ostringstream listing;
+
+ struct dirent **namelist;
+ int const counter = scandir(dir.c_str(), &namelist, filter_hidden_files, grouped_alpha_case_sort);
+ if (counter == -1) {
+ sendError(client, 500, request, content);
+ return;
+ }
+
+ listing << "<html><head><title>Index of " << dir << "</title>"
+ << "<style type=\"text/css\"><!-- td {padding: 0.02em 0.5em 0.02em 0.5em;}"
+ << "tr:nth-child(even){background-color:#dfdfdf;}"
+ << "h1, td:nth-child(3){text-align:center;}"
+ << "table {margin-left:auto;margin-right:auto;} --></style>"
+ << "</head>" << std::endl
+ << "<body><h1>Index of " << dir << "</h1>" << std::endl
+ << "<table><tr><th>#</th><th>Name</th><th>Size</th><th>Last-Modified</th></tr>" << std::endl;
+ if (dir != ".")
+ listing << "<tr><td>d</td><td><a href=\"..\">Parent Directory</a></td><td>-</td><td>-</td></tr>";
+ for (int i = 0; i < counter; ++i) {
+ struct stat fs;
+ std::string filename(dir);
+ filename.append("/").append(namelist[i]->d_name);
+ stat(filename.c_str(), &fs);
+ if (S_ISDIR(fs.st_mode)) {
+ listing << "<tr><td>d</td>"
+ << "<td><a href=\"" << namelist[i]->d_name << "/\">" << namelist[i]->d_name << "</a></td>"
+ << "<td>-</td>";
+ } else {
+ listing << "<tr><td>f</td>"
+ << "<td><a href=\"" << namelist[i]->d_name << "\">" << namelist[i]->d_name << "</a></td>"
+ << "<td>" << SizeToStr(fs.st_size) << "B</td>";
+ }
+ listing << "<td>" << TimeRFC1123(fs.st_mtime) << "</td></tr>" << std::endl;
+ }
+ listing << "</table></body></html>" << std::endl;
+
+ std::string response(listing.str());
+ addDataHeaders(headers, response);
+ sendHead(client, 200, headers);
+ if (content == true)
+ sendData(client, response);
+}
+ /*}}}*/
+bool parseFirstLine(int const client, std::string const &request, std::string &filename, bool &sendContent, bool &closeConnection) { /*{{{*/
+ if (strncmp(request.c_str(), "HEAD ", 5) == 0)
+ sendContent = false;
+ if (strncmp(request.c_str(), "GET ", 4) != 0)
+ {
+ sendError(client, 501, request, true);
+ return false;
+ }
+
+ size_t const lineend = request.find('\n');
+ size_t filestart = request.find(' ');
+ for (; request[filestart] == ' '; ++filestart);
+ size_t fileend = request.rfind(' ', lineend);
+ if (lineend == std::string::npos || filestart == std::string::npos ||
+ fileend == std::string::npos || filestart == fileend) {
+ sendError(client, 500, request, sendContent, "Filename can't be extracted");
+ return false;
+ }
+
+ size_t httpstart = fileend;
+ for (; request[httpstart] == ' '; ++httpstart);
+ if (strncmp(request.c_str() + httpstart, "HTTP/1.1\r", 9) == 0)
+ closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "Keep-Alive") != 0;
+ else if (strncmp(request.c_str() + httpstart, "HTTP/1.0\r", 9) == 0)
+ closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "close") == 0;
+ else {
+ sendError(client, 500, request, sendContent, "Not an HTTP/1.{0,1} request");
+ return false;
+ }
+
+ filename = request.substr(filestart, fileend - filestart);
+ if (filename.find(' ') != std::string::npos) {
+ sendError(client, 500, request, sendContent, "Filename contains an unencoded space");
+ return false;
+ }
+ filename = DeQuoteString(filename);
+
+ // this is not a secure server, but at least prevent the obvious …
+ if (filename.empty() == true || filename[0] != '/' ||
+ strncmp(filename.c_str(), "//", 2) == 0 ||
+ filename.find_first_of("\r\n\t\f\v") != std::string::npos ||
+ filename.find("/../") != std::string::npos) {
+ sendError(client, 400, request, sendContent, "Filename contains illegal character (sequence)");
+ return false;
+ }
+
+ // nuke the first character which is a / as we assured above
+ filename.erase(0, 1);
+ if (filename.empty() == true)
+ filename = ".";
+ return true;
+}
+ /*}}}*/
+int main(int const argc, const char * argv[])
+{
+ CommandLine::Args Args[] = {
+ {0, "simulate-paywall", "aptwebserver::Simulate-Paywall",
+ CommandLine::Boolean},
+ {0, "port", "aptwebserver::port", CommandLine::HasArg},
+ {'c',"config-file",0,CommandLine::ConfigFile},
+ {'o',"option",0,CommandLine::ArbItem},
+ {0,0,0,0}
+ };
+
+ CommandLine CmdL(Args, _config);
+ if(CmdL.Parse(argc,argv) == false) {
+ _error->DumpErrors();
+ exit(1);
+ }
+
+ // create socket, bind and listen to it {{{
+ // ignore SIGPIPE, this can happen on write() if the socket closes connection
+ signal(SIGPIPE, SIG_IGN);
+ int sock = socket(AF_INET6, SOCK_STREAM, 0);
+ if(sock < 0 ) {
+ _error->Errno("aptwerbserver", "Couldn't create socket");
+ _error->DumpErrors(std::cerr);
+ return 1;
+ }
+
+ // get the port
+ int const port = _config->FindI("aptwebserver::port", 8080);
+ bool const simulate_broken_server = _config->FindB("aptwebserver::Simulate-Paywall", false);
+
+ // ensure that we accept all connections: v4 or v6
+ int const iponly = 0;
+ setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &iponly, sizeof(iponly));
+ // to not linger to an address
+ int const enable = 1;
+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
+
+ struct sockaddr_in6 locAddr;
+ memset(&locAddr, 0, sizeof(locAddr));
+ locAddr.sin6_family = AF_INET6;
+ locAddr.sin6_port = htons(port);
+ locAddr.sin6_addr = in6addr_any;
+
+ if (bind(sock, (struct sockaddr*) &locAddr, sizeof(locAddr)) < 0) {
+ _error->Errno("aptwerbserver", "Couldn't bind");
+ _error->DumpErrors(std::cerr);
+ return 2;
+ }
+
+ if (simulate_broken_server) {
+ std::clog << "Simulating a broken web server that return nonsense "
+ "for all querries" << std::endl;
+ } else {
+ std::clog << "Serving ANY file on port: " << port << std::endl;
+ }
+
+ listen(sock, 1);
+ /*}}}*/
+
+ std::vector<std::string> messages;
+ int client;
+ while ((client = accept(sock, NULL, NULL)) != -1) {
+ std::clog << "ACCEPT client " << client
+ << " on socket " << sock << std::endl;
+
+ while (ReadMessages(client, messages)) {
+ bool closeConnection = false;
+ for (std::vector<std::string>::const_iterator m = messages.begin();
+ m != messages.end() && closeConnection == false; ++m) {
+ std::clog << ">>> REQUEST >>>>" << std::endl << *m
+ << std::endl << "<<<<<<<<<<<<<<<<" << std::endl;
+ std::list<std::string> headers;
+ std::string filename;
+ bool sendContent = true;
+ if (parseFirstLine(client, *m, filename, sendContent, closeConnection) == false)
+ continue;
+
+ std::string host = LookupTag(*m, "Host", "");
+ if (host.empty() == true) {
+ // RFC 2616 §14.23 requires Host
+ sendError(client, 400, *m, sendContent, "Host header is required");
+ continue;
+ }
+
+ if (simulate_broken_server == true) {
+ std::string data("ni ni ni\n");
+ addDataHeaders(headers, data);
+ sendHead(client, 200, headers);
+ sendData(client, data);
+ }
+ else if (RealFileExists(filename) == true) {
+ FileFd data(filename, FileFd::ReadOnly);
+ std::string condition = LookupTag(*m, "If-Modified-Since", "");
+ if (condition.empty() == false) {
+ time_t cache;
+ if (RFC1123StrToTime(condition.c_str(), cache) == true &&
+ cache >= data.ModificationTime()) {
+ sendHead(client, 304, headers);
+ continue;
+ }
+ }
+ condition = LookupTag(*m, "If-Range", "");
+ bool ignoreRange = false;
+ if (condition.empty() == false) {
+ time_t cache;
+ if (RFC1123StrToTime(condition.c_str(), cache) == false ||
+ cache < data.ModificationTime())
+ ignoreRange = true;
+ }
+ condition = LookupTag(*m, "Range", "");
+ if (ignoreRange == false && condition.empty() == false &&
+ strncmp(condition.c_str(), "bytes=", 6) == 0) {
+ size_t end = condition.find(',');
+ // FIXME: support multiple byte-ranges
+ if (end == std::string::npos) {
+ size_t start = 6;
+ unsigned long long filestart = strtoull(condition.c_str() + start, NULL, 10);
+ // FIXME: no fileend support
+ size_t dash = condition.find('-') + 1;
+ unsigned long long fileend = strtoull(condition.c_str() + dash, NULL, 10);
+ unsigned long long filesize = data.FileSize();
+ if (fileend == 0 || fileend == filesize) {
+ if (filesize > filestart) {
+ data.Skip(filestart);
+ std::ostringstream contentlength;
+ contentlength << "Content-Length: " << (filesize - filestart);
+ headers.push_back(contentlength.str());
+ std::ostringstream contentrange;
+ contentrange << "Content-Range: bytes " << filestart << "-"
+ << filesize - 1 << "/" << filesize;
+ headers.push_back(contentrange.str());
+ sendHead(client, 206, headers);
+ if (sendContent == true)
+ sendFile(client, data);
+ continue;
+ } else {
+ headers.push_back("Content-Length: 0");
+ std::ostringstream contentrange;
+ contentrange << "Content-Range: bytes 0-0/" << filesize;
+ headers.push_back(contentrange.str());
+ sendHead(client, 416, headers);
+ continue;
+ }
+ }
+ }
+ }
+
+ addFileHeaders(headers, data);
+ sendHead(client, 200, headers);
+ if (sendContent == true)
+ sendFile(client, data);
+ }
+ else if (DirectoryExists(filename) == true) {
+ if (filename == "." || filename[filename.length()-1] == '/')
+ sendDirectoryListing(client, filename, *m, sendContent);
+ else
+ sendRedirect(client, 301, filename.append("/"), *m, sendContent);
+ }
+ else
+ {
+ ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace");
+ if (Replaces != NULL) {
+ std::string redirect = "/" + filename;
+ for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next)
+ redirect = SubstVar(redirect, I->Tag, I->Value);
+ redirect.erase(0,1);
+ if (redirect != filename) {
+ sendRedirect(client, 301, redirect, *m, sendContent);
+ continue;
+ }
+ }
+ sendError(client, 404, *m, sendContent);
+ }
+ }
+ _error->DumpErrors(std::cerr);
+ messages.clear();
+ if (closeConnection == true)
+ break;
+ }
+
+ std::clog << "CLOSE client " << client
+ << " on socket " << sock << std::endl;
+ close(client);
+ }
+ return 0;
+}
diff --git a/test/interactive-helper/makefile b/test/interactive-helper/makefile
index 10d1e44ec..fee94cd77 100644
--- a/test/interactive-helper/makefile
+++ b/test/interactive-helper/makefile
@@ -37,3 +37,10 @@ include $(PROGRAM_H)
#SLIBS = -lapt-pkg -lrpm
#SOURCE = rpmver.cc
#include $(PROGRAM_H)
+
+# very simple webserver for APT testing
+PROGRAM=aptwebserver
+SLIBS = -lapt-pkg
+LIB_MAKES = apt-pkg/makefile
+SOURCE = aptwebserver.cc
+include $(PROGRAM_H)