summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/contrib/fileutl.cc17
-rw-r--r--apt-pkg/contrib/fileutl.h2
-rw-r--r--apt-pkg/contrib/gpgv.cc12
-rw-r--r--apt-pkg/deb/dpkgpm.cc2
-rw-r--r--apt-pkg/install-progress.cc59
-rw-r--r--apt-pkg/install-progress.h17
-rw-r--r--apt-pkg/policy.cc4
-rw-r--r--apt-pkg/tagfile.cc11
-rw-r--r--cmdline/apt-extracttemplates.cc11
-rw-r--r--cmdline/apt-get.cc10
-rw-r--r--cmdline/apt-key.in19
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog31
-rw-r--r--debian/tests/run-tests17
-rw-r--r--doc/apt-verbatim.ent4
-rw-r--r--doc/po/apt-doc.pot6
-rw-r--r--doc/po/de.po13
-rw-r--r--doc/po/es.po13
-rw-r--r--doc/po/fr.po13
-rw-r--r--doc/po/it.po13
-rw-r--r--doc/po/ja.po4
-rw-r--r--doc/po/pl.po13
-rw-r--r--doc/po/pt.po13
-rw-r--r--doc/po/pt_BR.po4
-rw-r--r--po/ar.po36
-rw-r--r--po/ast.po36
-rw-r--r--po/bg.po36
-rw-r--r--po/bs.po36
-rw-r--r--po/ca.po36
-rw-r--r--po/cs.po36
-rw-r--r--po/cy.po36
-rw-r--r--po/da.po435
-rw-r--r--po/de.po36
-rw-r--r--po/dz.po36
-rw-r--r--po/el.po36
-rw-r--r--po/es.po36
-rw-r--r--po/eu.po36
-rw-r--r--po/fi.po36
-rw-r--r--po/fr.po36
-rw-r--r--po/gl.po36
-rw-r--r--po/hu.po36
-rw-r--r--po/it.po36
-rw-r--r--po/ja.po36
-rw-r--r--po/km.po36
-rw-r--r--po/ko.po36
-rw-r--r--po/ku.po36
-rw-r--r--po/lt.po36
-rw-r--r--po/mr.po36
-rw-r--r--po/nb.po36
-rw-r--r--po/ne.po36
-rw-r--r--po/nl.po36
-rw-r--r--po/nn.po36
-rw-r--r--po/pl.po36
-rw-r--r--po/pt.po36
-rw-r--r--po/pt_BR.po36
-rw-r--r--po/ro.po36
-rw-r--r--po/ru.po36
-rw-r--r--po/sk.po36
-rw-r--r--po/sl.po36
-rw-r--r--po/sv.po36
-rw-r--r--po/th.po36
-rw-r--r--po/tl.po36
-rw-r--r--po/tr.po36
-rw-r--r--po/uk.po36
-rw-r--r--po/vi.po336
-rw-r--r--po/zh_CN.po36
-rw-r--r--po/zh_TW.po36
-rw-r--r--test/integration/exploid-keyring-with-dupe-keys.pubbin3986 -> 0 bytes
-rw-r--r--test/integration/exploid-keyring-with-dupe-subkeys.pubbin2016 -> 0 bytes
-rw-r--r--test/integration/framework17
-rw-r--r--test/integration/keyrings/test-archive-keyring.pubbin0 -> 979 bytes
-rw-r--r--test/integration/keyrings/test-archive-keyring.secbin0 -> 1355 bytes
-rw-r--r--test/integration/keyrings/test-master-keyring.pubbin0 -> 1199 bytes
-rw-r--r--test/integration/keyrings/test-master-keyring.secbin0 -> 2501 bytes
-rwxr-xr-xtest/integration/test-apt-key-net-update123
-rwxr-xr-xtest/integration/test-bug-728500-tempdir18
-rwxr-xr-xtest/integration/test-bug-732746-preferences32
-rw-r--r--test/libapt/fileutl_test.cc13
-rwxr-xr-xvendor/getinfo4
-rw-r--r--vendor/raspbian/apt-vendor.ent7
-rw-r--r--vendor/raspbian/makefile11
-rw-r--r--vendor/raspbian/sources.list.in6
-rw-r--r--vendor/steamos/apt-vendor.ent8
-rw-r--r--vendor/steamos/makefile11
-rw-r--r--vendor/steamos/sources.list.in5
-rw-r--r--vendor/ubuntu/sources.list.in4
86 files changed, 1454 insertions, 1362 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 130e990c3..ffb8b4b53 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1827,3 +1827,20 @@ std::vector<std::string> Glob(std::string const &pattern, int flags)
return result;
}
/*}}}*/
+
+std::string GetTempDir()
+{
+ const char *tmpdir = getenv("TMPDIR");
+
+#ifdef P_tmpdir
+ if (!tmpdir)
+ tmpdir = P_tmpdir;
+#endif
+
+ // check that tmpdir is set and exists
+ struct stat st;
+ if (!tmpdir || strlen(tmpdir) == 0 || stat(tmpdir, &st) != 0)
+ tmpdir = "/tmp";
+
+ return string(tmpdir);
+}
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index e9a9aab28..e752e9621 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -165,6 +165,8 @@ bool DirectoryExists(std::string const &Path) __attrib_const;
bool CreateDirectory(std::string const &Parent, std::string const &Path);
time_t GetModificationTime(std::string const &Path);
+std::string GetTempDir();
+
/** \brief Ensure the existence of the given Path
*
* \param Parent directory of the Path directory - a trailing
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index f47e7ea48..f57a72d86 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -10,6 +10,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <unistd.h>
#include<apt-pkg/configuration.h>
#include<apt-pkg/error.h>
@@ -21,16 +22,9 @@
/*}}}*/
static char * GenerateTemporaryFileTemplate(const char *basename) /*{{{*/
{
- const char *tmpdir = getenv("TMPDIR");
-#ifdef P_tmpdir
- if (!tmpdir)
- tmpdir = P_tmpdir;
-#endif
- if (!tmpdir)
- tmpdir = "/tmp";
-
std::string out;
- strprintf(out, "%s/%s.XXXXXX", tmpdir, basename);
+ std::string tmpdir = GetTempDir();
+ strprintf(out, "%s/%s.XXXXXX", tmpdir.c_str(), basename);
return strdup(out.c_str());
}
/*}}}*/
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 0d73733d5..14ce133cf 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1186,7 +1186,7 @@ bool pkgDPkgPM::GoNoABIBreak(APT::Progress::PackageManager *progress)
StartPtyMagic();
// Tell the progress that its starting and fork dpkg
- d->progress->Start();
+ d->progress->Start(d->master);
// this loop is runs once per dpkg operation
vector<Item>::const_iterator I = List.begin();
diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc
index 0caf62b61..fe065da4f 100644
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@ -9,6 +9,7 @@
#include <sys/ioctl.h>
#include <sstream>
#include <fcntl.h>
+#include <algorithm>
#include <stdio.h>
namespace APT {
@@ -222,17 +223,47 @@ bool PackageManagerProgressDeb822Fd::StatusChanged(std::string PackageName,
return true;
}
+
+PackageManagerFancy::PackageManagerFancy()
+ : child_pty(-1)
+{
+ // setup terminal size
+ old_SIGWINCH = signal(SIGWINCH, PackageManagerFancy::staticSIGWINCH);
+ instances.push_back(this);
+}
+std::vector<PackageManagerFancy*> PackageManagerFancy::instances;
+
+PackageManagerFancy::~PackageManagerFancy()
+{
+ instances.erase(find(instances.begin(), instances.end(), this));
+ signal(SIGWINCH, old_SIGWINCH);
+}
+
+void PackageManagerFancy::staticSIGWINCH(int signum)
+{
+ std::vector<PackageManagerFancy *>::const_iterator I;
+ for(I = instances.begin(); I != instances.end(); I++)
+ (*I)->HandleSIGWINCH(signum);
+}
+
int PackageManagerFancy::GetNumberTerminalRows()
{
struct winsize win;
+ // FIXME: get from "child_pty" instead?
if(ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&win) != 0)
return -1;
+
+ if(_config->FindB("Debug::InstallProgress::Fancy", false) == true)
+ std::cerr << "GetNumberTerminalRows: " << win.ws_row << std::endl;
return win.ws_row;
}
void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
{
+ if(_config->FindB("Debug::InstallProgress::Fancy", false) == true)
+ std::cerr << "SetupTerminalScrollArea: " << nr_rows << std::endl;
+
// scroll down a bit to avoid visual glitch when the screen
// area shrinks by one row
std::cout << "\n";
@@ -241,30 +272,22 @@ void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
std::cout << "\033[s";
// set scroll region (this will place the cursor in the top left)
- std::cout << "\033[1;" << nr_rows - 1 << "r";
+ std::cout << "\033[0;" << nr_rows - 1 << "r";
// restore cursor but ensure its inside the scrolling area
std::cout << "\033[u";
static const char *move_cursor_up = "\033[1A";
std::cout << move_cursor_up;
- // setup env for (hopefully!) ncurses
- string s;
- strprintf(s, "%i", nr_rows);
- setenv("LINES", s.c_str(), 1);
-
+ // ensure its flushed
std::flush(std::cout);
-}
-PackageManagerFancy::PackageManagerFancy()
-{
- // setup terminal size
- old_SIGWINCH = signal(SIGWINCH, HandleSIGWINCH);
-}
-
-PackageManagerFancy::~PackageManagerFancy()
-{
- signal(SIGWINCH, old_SIGWINCH);
+ // setup tty size to ensure xterm/linux console are working properly too
+ // see bug #731738
+ struct winsize win;
+ ioctl(child_pty, TIOCGWINSZ, (char *)&win);
+ win.ws_row = nr_rows - 1;
+ ioctl(child_pty, TIOCSWINSZ, (char *)&win);
}
void PackageManagerFancy::HandleSIGWINCH(int)
@@ -273,8 +296,9 @@ void PackageManagerFancy::HandleSIGWINCH(int)
SetupTerminalScrollArea(nr_terminal_rows);
}
-void PackageManagerFancy::Start()
+void PackageManagerFancy::Start(int a_child_pty)
{
+ child_pty = a_child_pty;
int nr_terminal_rows = GetNumberTerminalRows();
if (nr_terminal_rows > 0)
SetupTerminalScrollArea(nr_terminal_rows);
@@ -291,6 +315,7 @@ void PackageManagerFancy::Stop()
static const char* clear_screen_below_cursor = "\033[J";
std::cout << clear_screen_below_cursor;
}
+ child_pty = -1;
}
bool PackageManagerFancy::StatusChanged(std::string PackageName,
diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index 4b7590983..8a5b68a8f 100644
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -4,6 +4,7 @@
#include <string>
#include <unistd.h>
#include <signal.h>
+#include <vector>
namespace APT {
namespace Progress {
@@ -28,7 +29,7 @@ namespace Progress {
virtual ~PackageManager() {};
/* Global Start/Stop */
- virtual void Start() {};
+ virtual void Start(int child_pty=-1) {};
virtual void Stop() {};
/* When dpkg is invoked (may happen multiple times for each
@@ -116,16 +117,22 @@ namespace Progress {
class PackageManagerFancy : public PackageManager
{
+ private:
+ static void staticSIGWINCH(int);
+ static std::vector<PackageManagerFancy*> instances;
+
protected:
- static void SetupTerminalScrollArea(int nr_rows);
- static int GetNumberTerminalRows();
- static void HandleSIGWINCH(int);
+ void SetupTerminalScrollArea(int nr_rows);
+ void HandleSIGWINCH(int);
+
+ int GetNumberTerminalRows();
sighandler_t old_SIGWINCH;
+ int child_pty;
public:
PackageManagerFancy();
~PackageManagerFancy();
- virtual void Start();
+ virtual void Start(int child_pty=-1);
virtual void Stop();
virtual bool StatusChanged(std::string PackageName,
unsigned int StepsDone,
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 0a06cc6e3..d0f97441d 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -405,6 +405,10 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
PreferenceSection Tags;
while (TF.Step(Tags) == true)
{
+ // can happen when there are only comments in a record
+ if (Tags.Count() == 0)
+ continue;
+
string Name = Tags.FindS("Package");
if (Name.empty() == true)
return _error->Error(_("Invalid record in the preferences file %s, no Package header"), File.c_str());
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index e0802e3d5..bef3c76ba 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -259,7 +259,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
TagCount = 0;
while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
{
- TrimRecord(true,End);
+ TrimRecord(true,End);
+
+ // this can happen when TrimRecord trims away the entire Record
+ // (e.g. because it just contains comments)
+ if(Stop == End)
+ return true;
// Start a new index and add it to the hash
if (isspace(Stop[0]) == 0)
@@ -273,7 +278,9 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
if (Stop == 0)
return false;
- for (; Stop+1 < End && Stop[1] == '\r'; Stop++);
+ for (; Stop+1 < End && Stop[1] == '\r'; Stop++)
+ /* nothing */
+ ;
// Double newline marks the end of the record
if (Stop+1 < End && Stop[1] == '\n')
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 8fe15fdf9..8e1937113 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -47,8 +47,6 @@
using namespace std;
-#define TMPDIR "/tmp"
-
pkgCache *DebFile::Cache = 0;
// DebFile::DebFile - Construct the DebFile object /*{{{*/
@@ -253,14 +251,11 @@ string WriteFile(const char *package, const char *prefix, const char *data)
{
char fn[512];
static int i;
- const char *tempdir = NULL;
-
- tempdir = getenv("TMPDIR");
- if (tempdir == NULL)
- tempdir = TMPDIR;
+ std::string tempdir = GetTempDir();
snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d",
- _config->Find("APT::ExtractTemplates::TempDir", tempdir).c_str(),
+ _config->Find("APT::ExtractTemplates::TempDir",
+ tempdir.c_str()).c_str(),
package, prefix, getpid(), i++);
FileFd f;
if (data == NULL)
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 730d3ea18..8a0772ce2 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1536,14 +1536,12 @@ bool DoChangelog(CommandLine &CmdL)
bool const downOnly = _config->FindB("APT::Get::Download-Only", false);
char tmpname[100];
- char* tmpdir = NULL;
+ const char* tmpdir = NULL;
if (downOnly == false)
{
- const char* const tmpDir = getenv("TMPDIR");
- if (tmpDir != NULL && *tmpDir != '\0')
- snprintf(tmpname, sizeof(tmpname), "%s/apt-changelog-XXXXXX", tmpDir);
- else
- strncpy(tmpname, "/tmp/apt-changelog-XXXXXX", sizeof(tmpname));
+ std::string systemTemp = GetTempDir();
+ snprintf(tmpname, sizeof(tmpname), "%s/apt-changelog-XXXXXX",
+ systemTemp.c_str());
tmpdir = mkdtemp(tmpname);
if (tmpdir == NULL)
return _error->Errno("mkdtemp", "mkdtemp failed");
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 779872b4c..463e4b4b4 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -25,6 +25,9 @@ GPG_CMD="$GPG_CMD --no-auto-check-trustdb --trust-model always"
GPG="$GPG_CMD"
+APT_DIR="/"
+eval $(apt-config shell APT_DIR Dir)
+
MASTER_KEYRING='&keyring-master-filename;'
eval $(apt-config shell MASTER_KEYRING APT::Key::MasterKeyring)
ARCHIVE_KEYRING='&keyring-filename;'
@@ -33,7 +36,7 @@ REMOVED_KEYS='&keyring-removed-filename;'
eval $(apt-config shell REMOVED_KEYS APT::Key::RemovedKeys)
ARCHIVE_KEYRING_URI='&keyring-uri;'
eval $(apt-config shell ARCHIVE_KEYRING_URI APT::Key::ArchiveKeyringURI)
-TMP_KEYRING=/var/lib/apt/keyrings/maybe-import-keyring.gpg
+TMP_KEYRING=${APT_DIR}/var/lib/apt/keyrings/maybe-import-keyring.gpg
requires_root() {
if [ "$(id -u)" -ne 0 ]; then
@@ -107,7 +110,11 @@ add_keys_with_verify_against_master_keyring() {
# (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
+ APT_KEY_NET_UPDATE_ENABLED=""
+ eval $(apt-config shell APT_KEY_NET_UPDATE_ENABLED APT::Key::Net-Update-Enabled)
+ if [ -z "$APT_KEY_NET_UPDATE_ENABLED" ]; then
+ exit 1
+ fi
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"
@@ -120,15 +127,15 @@ net_update() {
echo >&2 "ERROR: an installed wget is required for a network-based update"
exit 1
fi
- if [ ! -d /var/lib/apt/keyrings ]; then
- mkdir -p /var/lib/apt/keyrings
+ if [ ! -d ${APT_DIR}/var/lib/apt/keyrings ]; then
+ mkdir -p ${APT_DIR}/var/lib/apt/keyrings
fi
- keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING)
+ keyring=${APT_DIR}/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING_URI)
old_mtime=0
if [ -e $keyring ]; then
old_mtime=$(stat -c %Y $keyring)
fi
- (cd /var/lib/apt/keyrings; wget --timeout=90 -q -N $ARCHIVE_KEYRING_URI)
+ (cd ${APT_DIR}/var/lib/apt/keyrings; wget --timeout=90 -q -N $ARCHIVE_KEYRING_URI)
if [ ! -e $keyring ]; then
return
fi
diff --git a/configure.ac b/configure.ac
index 05bbeeaad..42c5d73df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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.14.1"
+PACKAGE_VERSION="0.9.14.2"
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/changelog b/debian/changelog
index 41e6b758c..fb8c5714f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+apt (0.9.14.2) unstable; urgency=low
+
+ [ Joe Hansen ]
+ * Danish translation update. Closes: #732166
+
+ [ Peter Green ]
+ * add apt-vendor for raspbian. Closes: #732749
+
+ [ Thomas Bechtold ]
+ * apt-pkg/contrib/gpgv.cc: use /tmp as fallback dir if the
+ directory from $TMPDIR is not available (closes: #728500)
+
+ [ Michael Vogt ]
+ * vendor/getinfo:
+ - fix ubuntu-codename
+ * vendor/steamos/*:
+ - add steamos support
+ * bugfix/bts731738-fancy-progess:
+ - fix terminal size issues with e.g. "less" when "APT::Progress-Fancy=1"
+ is used (closes: #731738)
+ * feature/policy-parser-bts732746:
+ - allow more flexibility in /etc/apt/preferences, e.g. comment only
+ sections (closes: #732746)
+ * move TMPDIR handling into GetTempDir() and use that instead of
+ getenv("TMPDIR")
+ * update apt-key net-update and add integration test with the buildin
+ apt webserver
+ * run autopkgtest against the installed apt
+
+ -- Michael Vogt <mvo@debian.org> Sun, 29 Dec 2013 16:41:16 +0100
+
apt (0.9.14.1) unstable; urgency=medium
* fix apt-get source -t dist regression (closes: #731853)
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 6ea503568..233c5a386 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,6 +2,17 @@
set -e
-make
-make test
-test/integration/run-tests
+# auto-package-test is very unhappy if stuff it writen to stderr
+exec 2> apt-stderr.log
+
+# we need the buildin webserver for the tests
+if [ ! -e environment.mak ]; then
+ ./configure
+fi
+make -C test/interactive-helper/
+
+# run against the installed apt
+APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \
+APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \
+APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \
+./test/integration/run-tests
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 10e4d4d7c..9a061e61d 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,14 +219,14 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.14.1">
+<!ENTITY apt-product-version "0.9.14.2">
<!-- (Code)names for various things used all over the place -->
<!ENTITY oldstable-codename "squeeze">
<!ENTITY stable-codename "wheezy">
<!ENTITY testing-codename "jessie">
<!ENTITY stable-version "7">
-<!ENTITY ubuntu-codename "precise">
+<!ENTITY ubuntu-codename "trusty">
<!-- good and bad just refers to matching and not matching a pattern…
It is not a remark about the specific perl version.
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 8867b13e9..554206e01 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.14\n"
+"Project-Id-Version: apt-doc 0.9.14.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6155,7 +6155,7 @@ msgstr ""
#: guide.sgml:163
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/de.po b/doc/po/de.po
index 4e666eaf0..8983abb64 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-12-07 14:40+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -8685,9 +8685,18 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:163
+#, fuzzy
+#| msgid ""
+#| "<prgn>apt-get</prgn> has several command line options that are detailed "
+#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+#| "option is <tt>-d</tt> which does not install the fetched files. If the "
+#| "system has to download a large number of package it would be undesired to "
+#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
+#| "used the downloaded archives can be installed by simply running the "
+#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/es.po b/doc/po/es.po
index 37f0512ac..c26c9476b 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-12-07 14:40+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -8687,9 +8687,18 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:163
+#, fuzzy
+#| msgid ""
+#| "<prgn>apt-get</prgn> has several command line options that are detailed "
+#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+#| "option is <tt>-d</tt> which does not install the fetched files. If the "
+#| "system has to download a large number of package it would be undesired to "
+#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
+#| "used the downloaded archives can be installed by simply running the "
+#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index dd3242cb7..67a26a280 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-12-07 14:40+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -8648,9 +8648,18 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:163
+#, fuzzy
+#| msgid ""
+#| "<prgn>apt-get</prgn> has several command line options that are detailed "
+#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+#| "option is <tt>-d</tt> which does not install the fetched files. If the "
+#| "system has to download a large number of package it would be undesired to "
+#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
+#| "used the downloaded archives can be installed by simply running the "
+#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/it.po b/doc/po/it.po
index 21a90972f..13818f98d 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-12-07 14:40+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -8661,9 +8661,18 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:163
+#, fuzzy
+#| msgid ""
+#| "<prgn>apt-get</prgn> has several command line options that are detailed "
+#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+#| "option is <tt>-d</tt> which does not install the fetched files. If the "
+#| "system has to download a large number of package it would be undesired to "
+#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
+#| "used the downloaded archives can be installed by simply running the "
+#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 0f809ab85..d73f29523 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-12-07 14:40+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -8242,7 +8242,7 @@ msgstr ""
#: guide.sgml:163
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 021f2ad70..4b0f8d89c 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-12-07 14:40+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -7891,9 +7891,18 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:163
+#, fuzzy
+#| msgid ""
+#| "<prgn>apt-get</prgn> has several command line options that are detailed "
+#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+#| "option is <tt>-d</tt> which does not install the fetched files. If the "
+#| "system has to download a large number of package it would be undesired to "
+#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
+#| "used the downloaded archives can be installed by simply running the "
+#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 1f3bbcc50..7060351ce 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-12-07 14:40+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -8595,9 +8595,18 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:163
+#, fuzzy
+#| msgid ""
+#| "<prgn>apt-get</prgn> has several command line options that are detailed "
+#| "in its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+#| "option is <tt>-d</tt> which does not install the fetched files. If the "
+#| "system has to download a large number of package it would be undesired to "
+#| "start installing them in case something goes wrong. When <tt>-d</tt> is "
+#| "used the downloaded archives can be installed by simply running the "
+#| "command that caused them to be downloaded again without <tt>-d</tt>."
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index e33b40c44..a77b8319a 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-12-07 14:40+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -6570,7 +6570,7 @@ msgstr ""
#: guide.sgml:163
msgid ""
"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
+"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
"option is <tt>-d</tt> which does not install the fetched files. If the "
"system has to download a large number of package it would be undesired to "
"start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/po/ar.po b/po/ar.po
index 87767fe39..081e8de47 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -161,8 +161,8 @@ msgid " Version table:"
msgstr " جدول النسخ:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -469,11 +469,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr "الاتصال بـ%s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "الوحدات المدعومة:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -545,7 +545,7 @@ msgid "%s was already not hold.\n"
msgstr "%s هي النسخة الأحدث.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1574,12 +1574,12 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها
msgid "Merging available information"
msgstr "دمج المعلومات المتوفرة"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s ليس حزمة DEB صالحة."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1593,12 +1593,12 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "تعذرت الكتابة إلى %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
@@ -2325,12 +2325,12 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
@@ -2383,7 +2383,7 @@ msgid "Problem syncing the file"
msgstr "مشكلة في مزامنة الملف"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "إجهاض التثبيت."
@@ -2696,17 +2696,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -3058,12 +3058,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 6bb96394c..723546842 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -154,8 +154,8 @@ msgid " Version table:"
msgstr " Tabla de versiones:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -530,11 +530,11 @@ msgstr "Fallu al procesar les dependencies de construcción"
msgid "Changelog for %s (%s)"
msgstr "Coneutando a %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Módulos sofitaos:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -651,7 +651,7 @@ msgid "%s was already not hold.\n"
msgstr "%s yá ta na versión más nueva.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1708,12 +1708,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Fusionando información disponible"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s nun ye un paquete DEB válidu."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1738,12 +1738,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Nun se pue escribir en %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?"
@@ -2539,12 +2539,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subprocesu %s terminó de manera inesperada"
@@ -2597,7 +2597,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "L'aniellu de claves nun s'instaló en %s."
@@ -2922,18 +2922,18 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Rexistru inválidu nel ficheru de preferencies %s, nun hai cabecera Paquete"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nun s'entiende'l tipu de pin %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Nun hai prioridá (o ye cero) conseñada pa pin"
@@ -3306,12 +3306,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Executando dpkt"
diff --git a/po/bg.po b/po/bg.po
index c67cff84d..bb93a3e72 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -160,8 +160,8 @@ msgid " Version table:"
msgstr " Таблица с версиите:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -538,11 +538,11 @@ msgstr "Неуспех при обработката на зависимости
msgid "Changelog for %s (%s)"
msgstr "Журнал на промените в %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -658,7 +658,7 @@ msgid "%s was already not hold.\n"
msgstr "Пакетът „%s“ вече е задържан.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1739,12 +1739,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Смесване на наличната информация"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s не е валиден DEB пакет."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1770,12 +1770,12 @@ msgstr ""
" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Неуспех при записа на %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
@@ -2577,12 +2577,12 @@ msgstr "Нарушение на защитата на паметта (segmentati
msgid "Sub-process %s received signal %u."
msgstr "Под-процесът %s получи сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Подпроцесът %s върна код за грешка (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Подпроцесът %s завърши неочаквано"
@@ -2636,7 +2636,7 @@ msgid "Problem syncing the file"
msgstr "Проблем при синхронизиране на файла"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "В %s няма инсталиран ключодържател."
@@ -2971,17 +2971,17 @@ msgstr ""
"Стойността „%s“ на APT::Default-Release не е правилна, понеже в източниците "
"няма такова издание"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Невалиден запис във файла с настройки %s, липсва заглавна част Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Неизвестен тип за отбиване %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Няма указан приоритет (или е нула) на отбиването"
@@ -3361,12 +3361,12 @@ msgstr ""
msgid "Execute external solver"
msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Изпълняване на dpkg"
diff --git a/po/bs.po b/po/bs.po
index 81aa9442f..1f3a0a13a 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -156,8 +156,8 @@ msgid " Version table:"
msgstr ""
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -475,11 +475,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr ""
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -551,7 +551,7 @@ msgid "%s was already not hold.\n"
msgstr ""
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1567,12 +1567,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Sastavljam dostupne informacije"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s nije ispravan DEB paket."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1586,12 +1586,12 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Ne mogu zapisati na %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
@@ -2319,12 +2319,12 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
@@ -2377,7 +2377,7 @@ msgid "Problem syncing the file"
msgstr ""
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Odustajem od instalacije."
@@ -2691,17 +2691,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -3051,12 +3051,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 08c4a6275..be559ae68 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -158,8 +158,8 @@ msgid " Version table:"
msgstr " Taula de versió:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -540,11 +540,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:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -662,7 +662,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ja estava no retingut.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1730,12 +1730,12 @@ msgstr ""
msgid "Merging available information"
msgstr "S'està fusionant la informació disponible"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s no és un paquet DEB vàlid."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1759,12 +1759,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "No es pot escriure en %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?"
@@ -2563,12 +2563,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El sub-procés %s ha sortit inesperadament"
@@ -2621,7 +2621,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "No s'ha instaŀlat cap clauer a %s."
@@ -2951,17 +2951,17 @@ msgstr ""
"El valor «%s» és invàlid per a APT:Default-Release donat que aquest "
"llançament no és disponible a les fonts"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "No s'ha entès el pin de tipus %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "No hi ha prioritat especificada per al pin (o és zero)"
@@ -3348,12 +3348,12 @@ msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
msgid "Execute external solver"
msgstr "Executa un resoledor extern"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "S'està executant dpkg"
diff --git a/po/cs.po b/po/cs.po
index c4d0423c6..c4f634ac0 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -155,8 +155,8 @@ msgid " Version table:"
msgstr " Tabulka verzí:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -524,11 +524,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:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -641,7 +641,7 @@ msgid "%s was already not hold.\n"
msgstr "%s již nebyl držen v aktuální verzi.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1713,12 +1713,12 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova
msgid "Merging available information"
msgstr "Slučuji dostupné informace"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s není platný DEB balík."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1741,12 +1741,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Nelze zapsat do %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?"
@@ -2537,12 +2537,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočekávaně skončil"
@@ -2595,7 +2595,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "V %s není nainstalována žádná klíčenka."
@@ -2917,17 +2917,17 @@ msgstr ""
"Hodnota „%s“ není v APT::Default-Release platná, protože toto vydání není "
"dostupné v sources.list"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Neplatný záznam v souboru preferencí %s, chybí hlavička Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nerozumím vypíchnutí typu %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
@@ -3294,12 +3294,12 @@ msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
msgid "Execute external solver"
msgstr "Spuštění externího řešitele"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Spouštím dpkg"
diff --git a/po/cy.po b/po/cy.po
index 759111173..d2456f053 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -174,8 +174,8 @@ msgid " Version table:"
msgstr " Tabl Fersiynnau:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -546,13 +546,13 @@ msgstr "Methwyd prosesu dibyniaethau adeiladu"
msgid "Changelog for %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -665,7 +665,7 @@ msgid "%s was already not hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
@@ -1730,13 +1730,13 @@ msgstr ""
msgid "Merging available information"
msgstr "Yn cyfuno manylion Ar Gael"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "Nid yw %s yn becyn DEB dilys."
# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
#, fuzzy
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -1761,12 +1761,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
@@ -2571,12 +2571,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
@@ -2631,7 +2631,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Yn Erthylu'r Sefydliad."
@@ -2970,18 +2970,18 @@ msgid ""
msgstr ""
# FIXME: literal
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
# FIXME: tense
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Methwyd daeall y math pin %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
@@ -3345,12 +3345,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/da.po b/po/da.po
index af978db51..fad5ec57f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,8 +1,8 @@
# Danish translation apt.
-# Copyright (C) 2012 apt & nedenstående oversættere.
+# Copyright (C) 2013 apt & nedenstående oversættere.
# This file is distributed under the same license as the apt package.
# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2002, 2003, 2004, 2005, 2006, 2007.
-# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012, 2013.
#
# solver -> problemløser
#
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-12 18:37+0100\n"
-"PO-Revision-Date: 2012-07-03 23:51+0200\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"PO-Revision-Date: 2013-12-14 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
"Language: \n"
@@ -161,8 +161,8 @@ msgid " Version table:"
msgstr " Versionstabel:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -245,6 +245,10 @@ msgid ""
"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
"cdrom' for more information about the CD-ROM auto-detection and mount point."
msgstr ""
+"Der kunne ikke detekteres et cd-rom-drev eller findes et monteringspunkt.\n"
+"Du kan prøve tilvalget --cdrom for at angive cd-rom-monteringspunktet. Se "
+"»man apt-cdrom« for yderligere information om automatisk detektering af cd-"
+"rom og monteringspunkt."
#: cmdline/apt-cdrom.cc:89
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -297,29 +301,29 @@ msgstr ""
" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
#: cmdline/apt-get.cc:244
-#, fuzzy, c-format
+#, c-format
msgid "Can not find a package for architecture '%s'"
-msgstr "Kunne ikke finde nogle pakker med regulært udtryk '%s'"
+msgstr "Kan ikke finde en pakke for arkitektur »%s«"
#: cmdline/apt-get.cc:326
-#, fuzzy, c-format
+#, c-format
msgid "Can not find a package '%s' with version '%s'"
-msgstr "Kunne ikke finde nogle pakker med regulært udtryk '%s'"
+msgstr "Kan ikke finde en pakke »%s« med version »%s«"
#: cmdline/apt-get.cc:329
-#, fuzzy, c-format
+#, c-format
msgid "Can not find a package '%s' with release '%s'"
-msgstr "Kunne ikke finde nogle pakker med regulært udtryk '%s'"
+msgstr "Kan ikke finde en pakke »%s« med udgivelse »%s«"
#: cmdline/apt-get.cc:366
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Vælger '%s' som kildepakke fremfor '%s'\n"
+msgstr "Vælger »%s« som kildepakke fremfor »%s«\n"
#: cmdline/apt-get.cc:422
-#, fuzzy, c-format
+#, c-format
msgid "Can not find version '%s' of package '%s'"
-msgstr "Ignorer utilgængelig version '%s' af pakke '%s'"
+msgstr "Kan ikke finde version »%s« for pakke »%s«"
#: cmdline/apt-get.cc:453
#, c-format
@@ -367,7 +371,7 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-"BEMÆRK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' på:\n"
+"BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n"
"%s\n"
#: cmdline/apt-get.cc:784
@@ -384,7 +388,7 @@ msgstr ""
#: cmdline/apt-get.cc:837
#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "Overspringer allerede hentet fil '%s'\n"
+msgstr "Overspringer allerede hentet fil »%s«\n"
#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863
#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
@@ -422,7 +426,7 @@ msgstr "Nogle arkiver kunne ikke hentes."
#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325
msgid "Download complete and in download only mode"
-msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
+msgstr "Nedhentning afsluttet i »hent-kun«-tilstand"
#: cmdline/apt-get.cc:946
#, c-format
@@ -432,17 +436,17 @@ msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
#: cmdline/apt-get.cc:958
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr "Udpakningskommandoen '%s' fejlede.\n"
+msgstr "Udpakningskommandoen »%s« fejlede.\n"
#: cmdline/apt-get.cc:959
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
+msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
#: cmdline/apt-get.cc:981
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "Opbygningskommandoen '%s' fejlede.\n"
+msgstr "Opbygningskommandoen »%s« fejlede.\n"
#: cmdline/apt-get.cc:1001
msgid "Child process failed"
@@ -477,7 +481,7 @@ msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-"Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på '%s'"
+"Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«"
#: cmdline/apt-get.cc:1280
#, c-format
@@ -531,11 +535,11 @@ msgstr "Kunne ikke behandler opbygningsafhængighederne"
msgid "Changelog for %s (%s)"
msgstr "Ændringslog for %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Understøttede moduler:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -611,7 +615,7 @@ msgstr ""
" -qq Ingen uddata, kun fejl\n"
" -d Hent kun - installér eller udpak IKKE arkiverne\n"
" -s Gør intet. Simulér handlingen\n"
-" -y Antag 'ja'-svar til alle spørgsmål uden at spørge\n"
+" -y Antag »ja«-svar til alle spørgsmål uden at spørge\n"
" -f Forsøg at fortsætte selvom integritetstjek fejler\n"
" -m Forsøg at fortsætte selvom arkiverne ikke kan findes\n"
" -u Vis også en liste over opgraderede pakker\n"
@@ -649,7 +653,7 @@ msgid "%s was already not hold.\n"
msgstr "%s var allerede ikke i bero.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -727,6 +731,19 @@ msgid ""
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
+"Brug: apt [tilvalg] kommando\n"
+"\n"
+"CLI for apt.\n"
+"Kommandoer: \n"
+" list - vis pakker baseret på pakkenavn\n"
+" search - søg i pakkebeskrivelser\n"
+" show - vis pakkedetaljer\n"
+"\n"
+" update - opdater listen over tilgængelige pakker\n"
+" install - installer pakker\n"
+" upgrade - opgrader systemets pakker\n"
+"\n"
+" edit-sources - rediger source-informationsfilen (kildefilen)\n"
#: methods/cdrom.cc:203
#, c-format
@@ -810,7 +827,7 @@ msgstr ""
#: methods/ftp.cc:276
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "Logpå-skriptets kommando '%s' mislykkedes. Serveren sagde: %s"
+msgstr "Logpå-skriptets kommando »%s« mislykkedes. Serveren sagde: %s"
#: methods/ftp.cc:302
#, c-format
@@ -905,7 +922,7 @@ msgstr "Problem ved \"hashing\" af fil"
#: methods/ftp.cc:886
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Kunne ikke hente fil. Serveren sagde '%s'"
+msgstr "Kunne ikke hente fil. Serveren sagde »%s«"
#: methods/ftp.cc:901 methods/rsh.cc:332
msgid "Data socket timed out"
@@ -914,7 +931,7 @@ msgstr "Tidsudløb ved datasokkel"
#: methods/ftp.cc:931
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Dataoverførsel mislykkedes, serveren sagde '%s'"
+msgstr "Dataoverførsel mislykkedes, serveren sagde »%s«"
#. Get the files information
#: methods/ftp.cc:1008
@@ -965,22 +982,22 @@ msgstr "Forbinder til %s"
#: methods/connect.cc:180 methods/connect.cc:199
#, c-format
msgid "Could not resolve '%s'"
-msgstr "Kunne ikke omsætte navnet '%s'"
+msgstr "Kunne ikke omsætte navnet »%s«"
#: methods/connect.cc:205
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "Midlertidig fejl ved omsætning af navnet '%s'"
+msgstr "Midlertidig fejl ved omsætning af navnet »%s«"
#: methods/connect.cc:209
-#, fuzzy, c-format
+#, c-format
msgid "System error resolving '%s:%s'"
-msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
+msgstr "Systemfejl under opløsning af »%s:%s«"
#: methods/connect.cc:211
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
+msgstr "Der skete noget underligt under opløsning af »%s:%s« (%i - %s)"
#: methods/connect.cc:258
#, c-format
@@ -1000,7 +1017,7 @@ msgstr "Stødte på mindst én ugyldig signatur."
#: methods/gpgv.cc:173
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-"Kunne ikke køre 'gpgv' for at verificere signaturen (er gpgv installeret?)"
+"Kunne ikke køre »gpgv« for at verificere signaturen (er gpgv installeret?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
#: methods/gpgv.cc:179
@@ -1009,6 +1026,8 @@ msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
+"Clearsigned-fil er ikke gyldig, fik »%s« (kræver netværket ikke "
+"autentificering?)"
#: methods/gpgv.cc:183
msgid "Unknown error executing gpgv"
@@ -1081,7 +1100,7 @@ msgstr "Http-serveren sendte et ugyldigt Content-Range-hovede"
#: methods/server.cc:201
msgid "This HTTP server has broken range support"
msgstr ""
-"Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')"
+"Denne http-servere har fejlagtig understøttelse af intervaller (»ranges«)"
#: methods/server.cc:225
msgid "Unknown date format"
@@ -1099,9 +1118,10 @@ msgstr "Forbindelsen mislykkedes"
msgid "Internal error"
msgstr "Intern fejl"
+# måske visning, kategorisering
#: apt-private/private-list.cc:143
msgid "Listing"
-msgstr ""
+msgstr "Listing"
#: apt-private/private-install.cc:93
msgid "Internal error, InstallPackages was called with broken packages!"
@@ -1158,7 +1178,7 @@ msgstr "Der er problemer og -y blev brugt uden --force-yes"
#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
+msgstr "»Trivial Only« angivet, men dette er ikke en triviel handling."
#. 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)
@@ -1174,7 +1194,7 @@ msgid ""
" ?] "
msgstr ""
"Du er ved at gøre noget, der kan være skadeligt\n"
-"For at fortsætte, skal du skrive '%s'\n"
+"For at fortsætte, skal du skrive »%s«\n"
" ?] "
#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
@@ -1194,7 +1214,7 @@ msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' "
+"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre »apt-get update« "
"eller prøv med --fix-missing."
#: apt-private/private-install.cc:335
@@ -1294,7 +1314,7 @@ msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
+"Uopfyldte afhængigheder. Prøv »apt-get -f install« uden pakker (eller angiv "
"en løsning)."
#: apt-private/private-install.cc:639
@@ -1347,34 +1367,31 @@ msgstr "Kunne ikke hente %s %s\n"
#: apt-private/private-output.cc:198
msgid "installed,upgradable to: "
-msgstr ""
+msgstr "installeret,kan opgraderes til: "
#: apt-private/private-output.cc:204
-#, fuzzy
msgid "[installed,local]"
-msgstr " [Installeret]"
+msgstr "[Installeret,lokalt]"
#: apt-private/private-output.cc:207
msgid "[installed,auto-removable]"
-msgstr ""
+msgstr "[installeret,kan auto-fjernes]"
#: apt-private/private-output.cc:209
-#, fuzzy
msgid "[installed,automatic]"
-msgstr " [Installeret]"
+msgstr "[Installeret,automatisk]"
#: apt-private/private-output.cc:211
-#, fuzzy
msgid "[installed]"
-msgstr " [Installeret]"
+msgstr "[Installeret]"
#: apt-private/private-output.cc:217
msgid "[upgradable from: "
-msgstr ""
+msgstr "[kan opgraderes fra: "
#: apt-private/private-output.cc:223
msgid "[residual-config]"
-msgstr ""
+msgstr "[residual-konfig]"
#: apt-private/private-output.cc:314
msgid "The following packages have unmet dependencies:"
@@ -1525,7 +1542,7 @@ msgstr " Færdig"
#: apt-private/private-cachefile.cc:102
msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'."
+msgstr "Du kan muligvis rette dette ved at køre »apt-get -f install«."
#: apt-private/private-cachefile.cc:105
msgid "Unmet dependencies. Try using -f."
@@ -1533,20 +1550,19 @@ msgstr "Uopfyldte afhængigheder. Prøv med -f."
#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
msgid "Sorting"
-msgstr ""
+msgstr "Sortering"
#: apt-private/private-update.cc:45
msgid "The update command takes no arguments"
-msgstr "'update'-kommandoen benytter ingen parametre"
+msgstr "»update«-kommandoen benytter ingen parametre"
#: apt-private/private-upgrade.cc:18
msgid "Calculating upgrade... "
-msgstr "Beregner opgraderingen... "
+msgstr "Beregner opgraderingen ... "
#: apt-private/private-upgrade.cc:23
-#, fuzzy
msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern fejl, AllUpgrade ødelagde noget"
+msgstr "Intern fejl, opgradering blev afbrudt"
#: apt-private/private-upgrade.cc:25
msgid "Done"
@@ -1554,11 +1570,11 @@ msgstr "Færdig"
#: apt-private/private-search.cc:61
msgid "Full Text Search"
-msgstr ""
+msgstr "Fuldtekst-søgning"
#: apt-private/private-show.cc:106
msgid "not a real package (virtual)"
-msgstr ""
+msgstr "ikke en reel pakke (virtuel)"
#: apt-private/private-main.cc:19
msgid ""
@@ -1573,14 +1589,14 @@ msgstr ""
" så stol ikke på relevansen for den reelle aktuelle situation!"
#: apt-private/private-sources.cc:41
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse %s. Edit again? "
-msgstr "Kunne ikke omdøbe %s til %s"
+msgstr "Kunne ikke fortolke %s. Rediger igen? "
#: apt-private/private-sources.cc:52
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "Din »%s« fil blev ændret, kør venligst »apt-get update«."
#: apt-private/acqprogress.cc:60
msgid "Hit "
@@ -1616,8 +1632,8 @@ msgid ""
"in the drive '%s' and press enter\n"
msgstr ""
"Medieskift: Indsæt disken med navnet\n"
-" '%s'\n"
-"i drevet '%s' og tryk retur\n"
+" »%s«\n"
+"i drevet »%s« og tryk retur\n"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
@@ -1653,9 +1669,9 @@ msgid "Can not read mirror file '%s'"
msgstr "Kan ikke læse spejlfil »%s«"
#: methods/mirror.cc:315
-#, fuzzy, c-format
+#, c-format
msgid "No entry found in mirror file '%s'"
-msgstr "Kan ikke læse spejlfil »%s«"
+msgstr "Ingen post fundet i spejlfil »%s«"
#: methods/mirror.cc:445
#, c-format
@@ -1727,12 +1743,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Sammenfletter tilgængelighedsoplysninger"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s er ikke en gyldig DEB-pakke."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1756,12 +1772,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Kunne ikke skrive til %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan ikke finde debconfs version. Er debconf installeret?"
@@ -2271,7 +2287,7 @@ msgstr "Kunne ikke finde %s"
#: apt-inst/deb/debfile.cc:54
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler '%s'-elementet"
+msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet"
#: apt-inst/deb/debfile.cc:119
#, c-format
@@ -2370,7 +2386,7 @@ msgstr "Det valgte %s blev ikke fundet"
#: apt-pkg/contrib/configuration.cc:503
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Ukendt type-forkortelse: '%c'"
+msgstr "Ukendt type-forkortelse: »%c«"
#: apt-pkg/contrib/configuration.cc:617
#, c-format
@@ -2410,7 +2426,7 @@ msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
#: apt-pkg/contrib/configuration.cc:881
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv '%s'"
+msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv »%s«"
#: apt-pkg/contrib/configuration.cc:884
#, c-format
@@ -2434,18 +2450,18 @@ msgstr "%c%s... Færdig"
#: apt-pkg/contrib/progress.cc:179
msgid "..."
-msgstr ""
+msgstr "..."
#. Print the spinner
#: apt-pkg/contrib/progress.cc:195
-#, fuzzy, c-format
+#, c-format
msgid "%c%s... %u%%"
-msgstr "%c%s... Færdig"
+msgstr "%c%s... %u%%"
#: apt-pkg/contrib/cmndline.cc:116
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kommandolinjetilvalget '%c' [fra %s] kendes ikke."
+msgstr "Kommandolinjetilvalget »%c« [fra %s] kendes ikke."
#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
#: apt-pkg/contrib/cmndline.cc:158
@@ -2471,17 +2487,17 @@ msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>."
#: apt-pkg/contrib/cmndline.cc:273
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Tilvalget %s kræver et heltalligt parameter, ikke '%s'"
+msgstr "Tilvalget %s kræver et heltalligt parameter, ikke »%s«"
#: apt-pkg/contrib/cmndline.cc:304
#, c-format
msgid "Option '%s' is too long"
-msgstr "Tilvalget '%s' er for langt"
+msgstr "Tilvalget »%s« er for langt"
#: apt-pkg/contrib/cmndline.cc:336
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr "%s blev ikke forstået, prøv med 'true' eller 'false'."
+msgstr "%s blev ikke forstået, prøv med »true« eller »false«."
#: apt-pkg/contrib/cmndline.cc:386
#, c-format
@@ -2553,12 +2569,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s returnerede en fejlkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s afsluttedes uventet"
@@ -2611,7 +2627,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Ingen nøglering installeret i %s."
@@ -2635,7 +2651,7 @@ msgstr "Pakke-mellemlagerets fil er ødelagt, den er for lille"
#: apt-pkg/pkgcache.cc:167
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "Denne APT understøtter ikke versionssystemet '%s'"
+msgstr "Denne APT understøtter ikke versionssystemet »%s«"
#: apt-pkg/pkgcache.cc:172
msgid "The package cache was built for a different architecture"
@@ -2801,7 +2817,7 @@ msgstr "Ugyldig linje %u i kildelisten %s (type)"
#: apt-pkg/sourcelist.cc:293
#, 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"
+msgstr "Typen »%s« er ukendt på linje %u i kildelisten %s"
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
@@ -2894,12 +2910,12 @@ msgstr "Metoden %s startede ikke korrekt"
#: apt-pkg/acquire-worker.cc:447
#, c-format
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."
+msgstr "Indsæt disken med navnet: »%s« i drevet »%s« og tryk retur."
#: apt-pkg/init.cc:143
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet '%s' understøttes ikke"
+msgstr "Pakkesystemet »%s« understøttes ikke"
#: apt-pkg/init.cc:159
msgid "Unable to determine a suitable packaging system type"
@@ -2912,7 +2928,7 @@ msgstr "Kunne ikke finde %s."
#: apt-pkg/srcrecords.cc:47
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Du skal have nogle 'source'-URI'er i din sources.list"
+msgstr "Du skal have nogle »source«-URI'er i din sources.list"
#: apt-pkg/cachefile.cc:87
msgid "The package lists or status file could not be parsed or opened."
@@ -2920,7 +2936,7 @@ msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes."
#: apt-pkg/cachefile.cc:91
msgid "You may want to run apt-get update to correct these problems"
-msgstr "Du kan muligvis rette problemet ved at køre 'apt-get update'"
+msgstr "Du kan muligvis rette problemet ved at køre »apt-get update«"
#: apt-pkg/cachefile.cc:109
msgid "The list of sources could not be read."
@@ -2935,17 +2951,17 @@ msgstr ""
"Værdien »%s« er ugyldig for APT::Default-Release da sådan en udgivelse ikke "
"er tilgængelig i kilderne"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ugyldig indgang i indstillingsfilen %s, pakkehovedet mangler"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Kunne ikke forstå pin-type %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
@@ -3023,9 +3039,8 @@ msgid "Size mismatch"
msgstr "Størrelsen stemmer ikke"
#: apt-pkg/acquire-item.cc:164
-#, fuzzy
msgid "Invalid file format"
-msgstr "Ugyldig handling %s"
+msgstr "Ugyldigt filformat"
#: apt-pkg/acquire-item.cc:1419
#, c-format
@@ -3093,7 +3108,7 @@ msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«"
#, 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."
+msgstr "Pakkeindeksfilerne er i stykker. Intet »Filename:«-felt for pakken %s."
#: apt-pkg/indexrecords.cc:73
#, c-format
@@ -3113,12 +3128,12 @@ msgstr "Intet hashpunkt i udgivelsesfil %s"
#: apt-pkg/indexrecords.cc:125
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldigt punkt 'Valid-Until' i udgivelsesfil %s"
+msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ugyldigt punkt 'Date' i udgivelsesfil %s"
+msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
#: apt-pkg/vendorlist.cc:78
#, c-format
@@ -3136,7 +3151,7 @@ msgstr ""
#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
msgid "Identifying.. "
-msgstr "Identificerer.. "
+msgstr "Identificerer .. "
#: apt-pkg/cdrom.cc:613
#, c-format
@@ -3145,7 +3160,7 @@ msgstr "Gemt mærkat: %s \n"
#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
msgid "Unmounting CD-ROM...\n"
-msgstr "Afmonterer cdrom...\n"
+msgstr "Afmonterer cdrom ...\n"
#: apt-pkg/cdrom.cc:642
#, c-format
@@ -3158,15 +3173,15 @@ msgstr "Afmonterer cdrom\n"
#: apt-pkg/cdrom.cc:665
msgid "Waiting for disc...\n"
-msgstr "Venter på disken...\n"
+msgstr "Venter på disken ...\n"
#: apt-pkg/cdrom.cc:674
msgid "Mounting CD-ROM...\n"
-msgstr "Monterer cdrom...\n"
+msgstr "Monterer cdrom ...\n"
#: apt-pkg/cdrom.cc:693
msgid "Scanning disc for index files..\n"
-msgstr "Skanner disken for indeksfiler..\n"
+msgstr "Skanner disken for indeksfiler ..\n"
#: apt-pkg/cdrom.cc:744
#, c-format
@@ -3188,7 +3203,7 @@ msgstr ""
#: apt-pkg/cdrom.cc:782
#, c-format
msgid "Found label '%s'\n"
-msgstr "Fandt mærkatet '%s'\n"
+msgstr "Fandt mærkatet »%s«\n"
#: apt-pkg/cdrom.cc:811
msgid "That is not a valid name, try again.\n"
@@ -3201,11 +3216,11 @@ msgid ""
"'%s'\n"
msgstr ""
"Denne disk hedder: \n"
-" %s \n"
+"»%s«\n"
#: apt-pkg/cdrom.cc:830
msgid "Copying package lists..."
-msgstr "Kopierer pakkelisterne..."
+msgstr "Kopierer pakkelisterne ..."
#: apt-pkg/cdrom.cc:865
msgid "Writing new source list\n"
@@ -3248,27 +3263,27 @@ msgstr "Hashsum stemmer ikke: %s"
#: apt-pkg/cacheset.cc:467
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "Udgaven '%s' for '%s' blev ikke fundet"
+msgstr "Udgaven »%s« for »%s« blev ikke fundet"
#: apt-pkg/cacheset.cc:470
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr "Versionen '%s' for '%s' blev ikke fundet"
+msgstr "Versionen »%s« for »%s« blev ikke fundet"
#: apt-pkg/cacheset.cc:581
#, c-format
msgid "Couldn't find task '%s'"
-msgstr "Kunne ikke finde opgaven '%s'"
+msgstr "Kunne ikke finde opgaven »%s«"
#: apt-pkg/cacheset.cc:587
#, c-format
msgid "Couldn't find any package by regex '%s'"
-msgstr "Kunne ikke finde nogle pakker med regulært udtryk '%s'"
+msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
#: apt-pkg/cacheset.cc:598
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Kan ikke vælge versioner fra pakke '%s' som er vitalt"
+msgstr "Kan ikke vælge versioner fra pakke »%s« som er vitalt"
#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
#, c-format
@@ -3276,13 +3291,13 @@ msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-"Kan ikke vælge installeret eller kandidatversion fra pakke '%s' da den ikke "
+"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
"har nogen af dem"
#: apt-pkg/cacheset.cc:619
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr "Kan ikke vælge nyeste version fra pakke '%s' som er vital"
+msgstr "Kan ikke vælge nyeste version fra pakke »%s« som er vital"
#: apt-pkg/cacheset.cc:627
#, c-format
@@ -3316,12 +3331,12 @@ msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
msgid "Execute external solver"
msgstr "Kør ekstern problemløser"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
-msgstr ""
+msgstr "Status: [%3i%%]"
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Kører dpkg"
@@ -3367,12 +3382,12 @@ msgstr "Kører førinstallationsudløser %s"
#: apt-pkg/deb/dpkgpm.cc:809
#, c-format
msgid "Directory '%s' missing"
-msgstr "Mappe '%s' mangler"
+msgstr "Mappe »%s« mangler"
#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846
#, c-format
msgid "Could not open file '%s'"
-msgstr "Kunne ikke åbne filen '%s'"
+msgstr "Kunne ikke åbne filen »%s«"
#: apt-pkg/deb/dpkgpm.cc:971
#, c-format
@@ -3415,17 +3430,17 @@ msgid "Completely removed %s"
msgstr "Fjernede %s helt"
#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
-#, fuzzy, c-format
+#, c-format
msgid "Can not write log (%s)"
-msgstr "Kunne ikke skrive til %s"
+msgstr "Kan ikke skrive log (%s)"
#: apt-pkg/deb/dpkgpm.cc:1045
msgid "Is /dev/pts mounted?"
-msgstr ""
+msgstr "Er /dev/pts monteret?"
#: apt-pkg/deb/dpkgpm.cc:1066
msgid "Is stdout a terminal?"
-msgstr ""
+msgstr "Er standardud en terminal?"
#: apt-pkg/deb/dpkgpm.cc:1549
msgid "Operation was interrupted before it could finish"
@@ -3465,12 +3480,12 @@ msgstr ""
"hukommelsesfejl"
#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
-#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-"Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
+"system"
#: apt-pkg/deb/dpkgpm.cc:1665
msgid ""
@@ -3496,180 +3511,8 @@ msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet."
+msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet."
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
msgstr "Ikke låst"
-
-#~ msgid "Note, selecting '%s' for task '%s'\n"
-#~ msgstr "Bemærk, vælger »%s« til opgave »%s«\n"
-
-#~ msgid "Note, selecting '%s' for regex '%s'\n"
-#~ msgstr "Bemærk, vælger »%s« for regulært udtryk »%s«\n"
-
-#~ msgid "Package %s is a virtual package provided by:\n"
-#~ msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
-
-#~ msgid " [Not candidate version]"
-#~ msgstr " [Ingen kandidatversion]"
-
-#~ msgid "You should explicitly select one to install."
-#~ msgstr "Du bør eksplicit vælge en at installere."
-
-#~ 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 ""
-#~ "Pakken %s har ingen tilgængelig version, men der refereres til den i en \n"
-#~ "anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n"
-#~ "kun kan hentes fra andre kilder\n"
-
-#~ msgid "However the following packages replace it:"
-#~ msgstr "Dog kan følgende pakker erstatte den:"
-
-#~ msgid "Package '%s' has no installation candidate"
-#~ msgstr "Pakken »%s« har ingen installationskandidat"
-
-#~ msgid "Virtual packages like '%s' can't be removed\n"
-#~ msgstr "Virtuelle pakker som »%s« kan ikke fjernes\n"
-
-#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-#~ msgstr ""
-#~ "Pakken »%s« er ikke installeret, så den afinstalleres ikke. Mente du "
-#~ "»%s«?\n"
-
-#~ msgid "Package '%s' is not installed, so not removed\n"
-#~ msgstr "Pakken »%s« er ikke installeret, så den afinstalleres ikke\n"
-
-#~ msgid "Note, selecting '%s' instead of '%s'\n"
-#~ msgstr "Bemærk, vælger »%s« fremfor »%s«\n"
-
-#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-#~ msgstr ""
-#~ "Overspringer %s, da den allerede er installeret og opgradering er "
-#~ "deaktiveret.\n"
-
-#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-#~ msgstr ""
-#~ "Overspringer %s, den er ikke installeret og der er kun forespurgt efter "
-#~ "opgraderinger.\n"
-
-#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-#~ msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
-
-#~ msgid "%s is already the newest version.\n"
-#~ msgstr "%s er i forvejen den nyeste version.\n"
-
-#~ msgid "Selected version '%s' (%s) for '%s'\n"
-#~ msgstr "Valgte version »%s« (%s) for »%s«\n"
-
-#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-#~ msgstr "Valgte version »%s« (%s) for »%s« på grund af »%s«\n"
-
-#~ msgid "Ignore unavailable target release '%s' of package '%s'"
-#~ msgstr "Ignorer utilgængelig måludgivelse '%s' af pakke '%s'"
-
-#~ msgid "Downloading %s %s"
-#~ msgstr "Henter %s %s"
-
-#~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-#~ msgstr ""
-#~ "Dette er ikke et gyldigt DEB-arkiv, det har intet '%s', '%s' eller '%s'-"
-#~ "element"
-
-#~ msgid "MD5Sum mismatch"
-#~ msgstr "MD5Sum stemmer ikke"
-
-#~ msgid ""
-#~ "I wasn't able to locate a file for the %s package. This might mean you "
-#~ "need to manually fix this package."
-#~ msgstr ""
-#~ "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du "
-#~ "er nødt til manuelt at reparere denne pakke."
-
-#~ msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-#~ msgstr ""
-#~ "Kan ikke skrive log, openpty() mislykkedes (/dev/pts ej monteret?)\n"
-
-#~ msgid "File %s doesn't start with a clearsigned message"
-#~ msgstr "Fil %s starter ikke med en »clearsigned« besked"
-
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Springer ikkeeksisterende fil over %s"
-
-#~ msgid "Failed to remove %s"
-#~ msgstr "Kunne ikke slette %s"
-
-#~ msgid "Unable to create %s"
-#~ msgstr "Kunne ikke oprette %s"
-
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Kunne ikke finde %sinfo"
-
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "Mapperne info og temp skal ligge i samme filsystem"
-
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Kunne ikke skifte til admin-mappen %sinfo"
-
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Intern fejl under hentning af et pakkenavn"
-
-#~ msgid "Reading file listing"
-#~ msgstr "Læser fillisten"
-
-#~ 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 ""
-#~ "Kunne ikke åbne listefilen '%sinfo/%s'. Hvis du ikke kan genskabe denne "
-#~ "fil, kan du gøre dem tom og med det samme geninstallere den samme version "
-#~ "af pakken!"
-
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Kunne ikke læse listefilen %sinfo/%s"
-
-#~ msgid "Internal error getting a node"
-#~ msgstr "Intern fejl under hentning af knude"
-
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Kunne ikke åbne omrokeringsfilen %sdiversions"
-
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Pakkeomrokeringsfilen er ødelagt"
-
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Ugyldig linje i omrokeringsfilen: %s"
-
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Intern fejl under tilføjelse af omrokering"
-
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "pkg-mellemlageret skal initialiseres først"
-
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Kunne ikke finde et Package:-hovede, forskydning %lu"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Ugyldig ConfFile-afsnit i statusfilen. Forskydning %lu"
-
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Fejl under tolkning af MD5. Forskydning %lu"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Kunne ikke skifte til %s"
-
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Kunne ikke finde en gyldig kontrolfil"
-
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Kunne ikke åbne datarør for %s"
-
-#~ msgid "Read error from %s process"
-#~ msgstr "Læsefejl fra %s-process"
-
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
diff --git a/po/de.po b/po/de.po
index 1033dbe75..858ef4faa 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -162,8 +162,8 @@ msgid " Version table:"
msgstr " Versionstabelle:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -548,11 +548,11 @@ msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
msgid "Changelog for %s (%s)"
msgstr "Änderungsprotokoll (Changelog) für %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -674,7 +674,7 @@ msgid "%s was already not hold.\n"
msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1775,12 +1775,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Verfügbare Informationen werden zusammengeführt."
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s ist kein gültiges DEB-Paket."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1804,12 +1804,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Schreiben nach %s nicht möglich"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
@@ -2618,12 +2618,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Unterprozess %s unerwartet beendet"
@@ -2680,7 +2680,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Kein Schlüsselring in %s installiert"
@@ -3014,18 +3014,18 @@ msgstr ""
"Der Wert »%s« ist für APT::Default-Release ungültig, da solch eine "
"Veröffentlichung in den Paketquellen nicht verfügbar ist."
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Pinning-Typ %s kann nicht interpretiert werden."
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Keine Priorität (oder Null) für Pin angegeben"
@@ -3417,12 +3417,12 @@ msgstr ""
msgid "Execute external solver"
msgstr "Externen Problemlöser ausführen"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Ausführen von dpkg"
diff --git a/po/dz.po b/po/dz.po
index dcda1776f..f32a8809e 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -162,8 +162,8 @@ msgid " Version table:"
msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -524,11 +524,11 @@ msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འད
msgid "Changelog for %s (%s)"
msgstr "%s (%s)་ལུ་མཐུད་དོ།"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -643,7 +643,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1692,12 +1692,12 @@ msgstr ""
msgid "Merging available information"
msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s འདི་ནུས་ཅན་གྱི་ ཌི་ཨི་བི་ཅིག་མེན་པས།"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1721,12 +1721,12 @@ msgstr ""
" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་"
"བཟུམ།\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
@@ -2522,12 +2522,12 @@ msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བག
msgid "Sub-process %s received signal %u."
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།"
@@ -2580,7 +2580,7 @@ msgid "Problem syncing the file"
msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
@@ -2903,17 +2903,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་ ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
@@ -3273,12 +3273,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/el.po b/po/el.po
index ee5acea16..7d2685f38 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -167,8 +167,8 @@ msgid " Version table:"
msgstr " Πίνακας Έκδοσης:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -540,11 +540,11 @@ msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισ
msgid "Changelog for %s (%s)"
msgstr "Changelog για %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -655,7 +655,7 @@ msgid "%s was already not hold.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1712,12 +1712,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "Το %s δεν είναι έγκυρο πακέτο DEB."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1741,12 +1741,12 @@ msgstr ""
" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Αδύνατη η εγγραφή στο %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
@@ -2546,12 +2546,12 @@ msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμ
msgid "Sub-process %s received signal %u."
msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα"
@@ -2604,7 +2604,7 @@ msgid "Problem syncing the file"
msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Εγκατάλειψη της εγκατάστασης."
@@ -2929,17 +2929,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr ""
"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
@@ -3302,12 +3302,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 5147bad0a..98cae4093 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -212,8 +212,8 @@ msgid " Version table:"
msgstr " Tabla de versión:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -594,11 +594,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:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -715,7 +715,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ya está en su versión más reciente.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1782,12 +1782,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Fusionando información disponible"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s no es un paquete DEB válido."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1812,12 +1812,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "No se puede escribir en %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "No se puede encontrar la versión de debconf. ¿Está debconf instalado?"
@@ -2622,12 +2622,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "El subproceso %s terminó de forma inesperada"
@@ -2680,7 +2680,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "No se instaló ningún anillo de claves %s."
@@ -3013,18 +3013,18 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Registro inválido en el archivo de preferencias %s, no hay cabecera «Package»"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "No se entiende el pin tipo %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "No hay prioridad especificada para pin (o es cero)"
@@ -3406,12 +3406,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Ejecutando dpkg"
diff --git a/po/eu.po b/po/eu.po
index 32243acf4..743367e45 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -160,8 +160,8 @@ msgid " Version table:"
msgstr " Bertsio taula:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -525,11 +525,11 @@ msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
msgid "Changelog for %s (%s)"
msgstr "Konektatzen -> %s.(%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -642,7 +642,7 @@ msgid "%s was already not hold.\n"
msgstr "%s bertsiorik berriena da jada.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1698,12 +1698,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Eskuragarrien datuak biltzen"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s ez da baliozko DEB pakete bat."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1727,12 +1727,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "%s : ezin da idatzi"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
@@ -2525,12 +2525,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s azpiprozesua ustekabean amaitu da"
@@ -2583,7 +2583,7 @@ msgid "Problem syncing the file"
msgstr "Arazoa fitxategia sinkronizatzean"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Abortatu instalazioa."
@@ -2903,17 +2903,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Ez da ulertu %s orratz-mota (pin)"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
@@ -3272,12 +3272,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 9845f3c3a..5fceb73ef 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -158,8 +158,8 @@ msgid " Version table:"
msgstr " Versiotaulukko:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -521,11 +521,11 @@ msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
msgid "Changelog for %s (%s)"
msgstr "Avataan yhteys %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -637,7 +637,7 @@ msgid "%s was already not hold.\n"
msgstr "%s on jo uusin versio.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1691,12 +1691,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Yhdistetään saatavuustiedot"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s ei kelpaa DEB-paketiksi."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1720,12 +1720,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?"
@@ -2516,12 +2516,12 @@ msgstr "Aliprosessi %s aiheutti suojausvirheen."
msgid "Sub-process %s received signal %u."
msgstr "Aliprosessi %s aiheutti suojausvirheen."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Aliprosessi %s palautti virhekoodin (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Aliprosessi %s lopetti odottamatta"
@@ -2574,7 +2574,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Asennus keskeytetään."
@@ -2893,17 +2893,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Tunnistetyyppi %s on tuntematon"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
@@ -3264,12 +3264,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 997889dba..2c7f2114d 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\n"
"PO-Revision-Date: 2013-08-17 07:57+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -157,8 +157,8 @@ msgid " Version table:"
msgstr " Table de version :"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -554,11 +554,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:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Modules reconnus :"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -674,7 +674,7 @@ msgid "%s was already not hold.\n"
msgstr "%s était déjà marqué comme non figé.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1784,12 +1784,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Fusion des informations disponibles"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s n'est pas un paquet Debian valide."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1813,12 +1813,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Impossible d'écrire sur %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
@@ -2630,12 +2630,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Le sous-processus %s s'est arrêté prématurément"
@@ -2688,7 +2688,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Pas de porte-clés installé dans %s."
@@ -3031,19 +3031,19 @@ msgstr ""
"La valeur « %s » n'est pas valable pour APT::Default-Release car cette "
"version ne fait pas partie des sources disponibles."
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Enregistrement non valable dans le fichier de préférences %s, aucune entrée "
"« Package »."
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Type d'épinglage %s inconnu"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage"
@@ -3438,12 +3438,12 @@ msgstr "Échec du solveur externe sans message d'erreur adapté"
msgid "Execute external solver"
msgstr "Exécu tion du solveur externe"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Exécution de dpkg"
diff --git a/po/gl.po b/po/gl.po
index c663e392e..594340651 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -162,8 +162,8 @@ msgid " Version table:"
msgstr " Táboa de versións:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -537,11 +537,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:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Módulos admitidos:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -660,7 +660,7 @@ msgid "%s was already not hold.\n"
msgstr "%s xa é a versión máis recente.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1730,12 +1730,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Mesturando a información sobre paquetes dispoñíbeis"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s non é un paquete DEB válido."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1760,12 +1760,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Non é posíbel escribir en %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?"
@@ -2569,12 +2569,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O subproceso %s saíu de xeito inesperado"
@@ -2627,7 +2627,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Non ha ningún chaveiro instalado en %s."
@@ -2955,18 +2955,18 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Rexistro incorrecto no ficheiro de preferencias %s; falta a cabeceira Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Non se entendeu o tipo de inmobilización %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr ""
"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
@@ -3348,12 +3348,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Executando dpkg"
diff --git a/po/hu.po b/po/hu.po
index 9898c7300..d91bd407e 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -160,8 +160,8 @@ msgid " Version table:"
msgstr " Verziótáblázat:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -536,11 +536,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:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -655,7 +655,7 @@ msgid "%s was already not hold.\n"
msgstr "%s eddig sem volt visszafogva.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1733,12 +1733,12 @@ msgstr "előtti hibák fontosak. Javítsa azokat, és futtassa az [I]nstallt új
msgid "Merging available information"
msgstr "Elérhető információk egyesítése"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s nem egy érvényes DEB csomag."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1763,12 +1763,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Nem lehet írni ebbe: %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?"
@@ -2570,12 +2570,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s alfolyamat váratlanul kilépett"
@@ -2628,7 +2628,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Nincs kulcstartó telepítve ide: %s."
@@ -2964,17 +2964,17 @@ msgstr ""
"A(z) „%s” érték érvénytelen az APT::Default-Release beállításhoz, mert nincs "
"ilyen kiadás a forrásokban"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Érvénytelen rekord a(z) %s beállításfájlban, nincs Package fejléc"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "A(z) %s rögzítéstípus nem értelmezhető"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez"
@@ -3347,12 +3347,12 @@ msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
msgid "Execute external solver"
msgstr "Külső solver végrehajtása"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "A dpkg futtatása"
diff --git a/po/it.po b/po/it.po
index 2f1f76212..d7f8a8a24 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\n"
"PO-Revision-Date: 2013-08-27 22:06+0200\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -160,8 +160,8 @@ msgid " Version table:"
msgstr " Tabella versione:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -548,11 +548,11 @@ msgstr "Elaborazione delle dipendenze di generazione non riuscita"
msgid "Changelog for %s (%s)"
msgstr "Changelog per %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -668,7 +668,7 @@ msgid "%s was already not hold.\n"
msgstr "%s era già non bloccato.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1768,12 +1768,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Unione delle informazioni disponibili"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s non è un pacchetto DEB valido."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1797,12 +1797,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Impossibile scrivere in %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Impossibile trovare la versione di debconf. È installato?"
@@ -2611,12 +2611,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Il sottoprocesso %s è uscito inaspettatamente"
@@ -2669,7 +2669,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Nessun portachiavi installato in %s."
@@ -3010,19 +3010,19 @@ msgstr ""
"Il valore \"%s\" non è valido per APT::Default-Release poiché tale release "
"non è disponibile dalle sorgenti"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package"
"\""
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Impossibile comprendere il tipo di gancio %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Priorità per il gancio non specificata (o zero)"
@@ -3409,12 +3409,12 @@ msgstr "Il solver esterno è terminato senza un errore di messaggio"
msgid "Execute external solver"
msgstr "Esecuzione solver esterno"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Esecuzione di dpkg"
diff --git a/po/ja.po b/po/ja.po
index 9c2d56fde..0b495027e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.9.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\n"
"PO-Revision-Date: 2013-08-11 19:39+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -157,8 +157,8 @@ msgid " Version table:"
msgstr " バージョンテーブル:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -538,11 +538,11 @@ msgstr "ビルド依存関係の処理に失敗しました"
msgid "Changelog for %s (%s)"
msgstr "%s (%s) の変更履歴"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -660,7 +660,7 @@ msgid "%s was already not hold.\n"
msgstr "%s はすでに保留されていません。\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1730,12 +1730,12 @@ msgstr "が重要です。これを修正して「導入」を再度実行して
msgid "Merging available information"
msgstr "入手可能情報をマージしています"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s は正しい DEB パッケージではありません。"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1759,12 +1759,12 @@ msgstr ""
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "%s に書き込めません"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"debconf のバージョンを取得できません。debconf はインストールされていますか?"
@@ -2559,12 +2559,12 @@ msgstr "子プロセス %s がセグメンテーション違反を受け取り
msgid "Sub-process %s received signal %u."
msgstr "子プロセス %s がシグナル %u を受け取りました。"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子プロセス %s がエラーコード (%u) を返しました"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子プロセス %s が予期せず終了しました"
@@ -2617,7 +2617,7 @@ msgid "Problem syncing the file"
msgstr "ファイルの同期中に問題が発生しました"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "%s にキーリングがインストールされていません。"
@@ -2950,19 +2950,19 @@ msgstr ""
"APT::Default-Release の 値 '%s' は、そのようなリリースをソース中から利用でき"
"ないため、無効です"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"不正なレコードがプリファレンスファイル %s に存在します。パッケージヘッダがあ"
"りません"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "pin タイプ %s を理解できませんでした"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "pin で優先度 (または 0) が指定されていません"
@@ -3337,12 +3337,12 @@ msgstr "外部ソルバが適切なエラーメッセージなしに失敗しま
msgid "Execute external solver"
msgstr "外部ソルバを実行"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "dpkg を実行しています"
diff --git a/po/km.po b/po/km.po
index 49bea637a..9729de5c1 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -162,8 +162,8 @@ msgid " Version table:"
msgstr " តារាង​កំណែ ៖"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -520,11 +520,11 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណ
msgid "Changelog for %s (%s)"
msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -635,7 +635,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1670,12 +1670,12 @@ msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន
msgid "Merging available information"
msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s មិនមែន​ជា​កញ្ចប់​ DEB ត្រឹមត្រូវ​ទេ​ ។"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1699,12 +1699,12 @@ msgstr ""
" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?"
@@ -2494,12 +2494,12 @@ msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​ក
msgid "Sub-process %s received signal %u."
msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
@@ -2552,7 +2552,7 @@ msgid "Problem syncing the file"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
@@ -2871,17 +2871,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្ជុល %s ឡើយ"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
@@ -3238,12 +3238,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 789899985..d6968b85f 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -153,8 +153,8 @@ msgid " Version table:"
msgstr " 버전 테이블:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -524,11 +524,11 @@ msgstr "빌드 의존성을 처리하는데 실패했습니다"
msgid "Changelog for %s (%s)"
msgstr "%s(%s)에 연결하는 중입니다"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -642,7 +642,7 @@ msgid "%s was already not hold.\n"
msgstr "%s 패키지는 이미 최신 버전입니다.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1689,12 +1689,12 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를
msgid "Merging available information"
msgstr "이용 가능 패키지 정보를 합칩니다"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s은(는) 올바른 DEB 패키지가 아닙니다."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1718,12 +1718,12 @@ msgstr ""
" -c=? 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "%s에 쓸 수 없습니다"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?"
@@ -2515,12 +2515,12 @@ msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받
msgid "Sub-process %s received signal %u."
msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다"
@@ -2573,7 +2573,7 @@ msgid "Problem syncing the file"
msgstr "파일을 동기화하는데 문제가 있습니다"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "%s에 키 모음을 설치하지 않았습니다."
@@ -2896,17 +2896,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "기본 설정 파일 %s에 잘못된 데이터가 있습니다. Package 헤더가 없습니다"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
@@ -3267,12 +3267,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "dpkg 실행하는 중입니다"
diff --git a/po/ku.po b/po/ku.po
index cf7814c53..7777615c3 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -161,8 +161,8 @@ msgid " Version table:"
msgstr " Tabloya guhertoyan:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -481,11 +481,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr "Girêdan bi %s (%s) re pêk tê"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -557,7 +557,7 @@ msgid "%s was already not hold.\n"
msgstr "%s jixwe guhertoya nûtirîn e.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1572,12 +1572,12 @@ msgstr ""
msgid "Merging available information"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s ne paketeke DEB ya derbasdar e."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1591,12 +1591,12 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Nivîsandin ji bo %s ne pêkane"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
@@ -2339,12 +2339,12 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
@@ -2397,7 +2397,7 @@ msgid "Problem syncing the file"
msgstr ""
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Sazkirin tê betalkirin."
@@ -2709,17 +2709,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -3068,12 +3068,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index b91517a4e..12ec54dbc 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -159,8 +159,8 @@ msgid " Version table:"
msgstr " Versijų lentelė:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -485,11 +485,11 @@ msgstr ""
msgid "Changelog for %s (%s)"
msgstr "Jungiamasi prie %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Palaikomi moduliai:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -561,7 +561,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ir taip jau yra naujausias.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1596,12 +1596,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Sujungiama turima informaija"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s nėra tikras DEB paketas."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1626,12 +1626,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Nepavyko įrašyti į %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?"
@@ -2428,12 +2428,12 @@ msgstr "Procesas %s gavo segmentavimo klaidą"
msgid "Sub-process %s received signal %u."
msgstr "Procesas %s gavo segmentavimo klaidą"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Procesas %s grąžino klaidos kodą (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Procesas %s netikėtai išėjo"
@@ -2486,7 +2486,7 @@ msgid "Problem syncing the file"
msgstr "Klaida sinchronizuojant failą"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Diegimas nutraukiamas."
@@ -2800,17 +2800,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr ""
@@ -3160,12 +3160,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 14294509c..ee2238550 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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 "
@@ -156,8 +156,8 @@ msgid " Version table:"
msgstr "आवृत्ती कोष्टक:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -514,11 +514,11 @@ msgstr "बांधणी-डिपेंडन्सीज क्रिया
msgid "Changelog for %s (%s)"
msgstr "%s (%s) ला जोडत आहे"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -631,7 +631,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1675,12 +1675,12 @@ msgstr ""
msgid "Merging available information"
msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s हे वैध डीईबी पॅकेज नाही "
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1704,12 +1704,12 @@ msgstr ""
" -c=? ही संरचना संचिका वाचा \n"
" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "%s मध्ये लिहिण्यास असमर्थ "
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?"
@@ -2499,12 +2499,12 @@ msgstr "%s उपक्रियेला सेगमेंटेशन दो
msgid "Sub-process %s received signal %u."
msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s उपक्रिया अचानकपणे बाहेर पडली"
@@ -2557,7 +2557,7 @@ msgid "Problem syncing the file"
msgstr "संचिकेची syncing समस्या"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "संस्थापन खंडित करत आहे."
@@ -2876,17 +2876,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही "
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "%s पिनचा प्रकार समजलेला नाही"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
@@ -3249,12 +3249,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 84c467fcb..3cca09bb2 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -161,8 +161,8 @@ msgid " Version table:"
msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -527,11 +527,11 @@ msgstr "Klarte ikke å behandle forutsetningene for bygging"
msgid "Changelog for %s (%s)"
msgstr "Kobler til %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Støttede moduler:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -646,7 +646,7 @@ msgid "%s was already not hold.\n"
msgstr "%s er allerede nyeste versjon.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1704,12 +1704,12 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
msgid "Merging available information"
msgstr "Fletter tilgjengelig informasjon"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s er ikke en gyldig debianpakke."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1734,12 +1734,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Kan ikke skrive til %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
@@ -2533,12 +2533,12 @@ msgstr "Underprosessen %s mottok et minnefeilsignal."
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok signalet %u."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s ga en feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avsluttet uventet"
@@ -2591,7 +2591,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Ingen nøkkelring installert i %s."
@@ -2914,17 +2914,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Forsto ikke spikring av typen %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) spesifisert for pin"
@@ -3292,12 +3292,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Kjører dpkg"
diff --git a/po/ne.po b/po/ne.po
index b8ab179c7..660924b79 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -159,8 +159,8 @@ msgid " Version table:"
msgstr " संस्करण तालिका:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -518,11 +518,11 @@ msgstr "निर्माण निर्भरताहरू प्रक्
msgid "Changelog for %s (%s)"
msgstr "%s (%s) मा जडान गरिदैछ"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "समर्थित मोड्युलहरू:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -633,7 +633,7 @@ msgid "%s was already not hold.\n"
msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1673,12 +1673,12 @@ msgstr ""
msgid "Merging available information"
msgstr "उपलब्ध सूचना गाँभिदैछ"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s वैध DEB प्याकेज होइन"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1702,12 +1702,12 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr " %s मा लेख्न असक्षम"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
@@ -2496,12 +2496,12 @@ msgstr "सहायक प्रक्रिया %s ले खण्डिक
msgid "Sub-process %s received signal %u."
msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो"
@@ -2554,7 +2554,7 @@ msgid "Problem syncing the file"
msgstr "फाइल गुप्तिकरण गर्दा समस्या"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "स्थापना परित्याग गरिदैछ ।"
@@ -2873,17 +2873,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "पिन टाइप %s बुझ्न सकिएन "
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
@@ -3240,12 +3240,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index e0a6c69d0..150c456e4 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -159,8 +159,8 @@ msgid " Version table:"
msgstr " Versietabel:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -539,11 +539,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:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -658,7 +658,7 @@ msgid "%s was already not hold.\n"
msgstr "%s is reeds de nieuwste versie.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1728,12 +1728,12 @@ msgstr ""
msgid "Merging available information"
msgstr "De beschikbare informatie wordt samengevoegd"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s is geen geldig DEB-pakket."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1758,12 +1758,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Kan niet naar %s schrijven"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?"
@@ -2567,12 +2567,12 @@ msgstr "Subproces %s ontving een segmentatiefout."
msgid "Sub-process %s received signal %u."
msgstr "Subproces %s ontving signaal %u."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Subproces %s gaf de foutcode %u terug"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subproces %s sloot onverwacht af"
@@ -2625,7 +2625,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Geen sleutelring geïnstalleerd in %s."
@@ -2956,18 +2956,18 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Ongeldige record in het voorkeurenbestand %s, 'Package' koptekst ontbreekt"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Pintype %s wordt niet begrepen"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
@@ -3346,12 +3346,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "dpkg wordt uitgevoerd"
diff --git a/po/nn.po b/po/nn.po
index d9de9765f..6cb37a7a3 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -161,8 +161,8 @@ msgid " Version table:"
msgstr " Versjonstabell:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -524,11 +524,11 @@ msgstr "Klarte ikkje behandla byggjekrava"
msgid "Changelog for %s (%s)"
msgstr "Koplar til %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -640,7 +640,7 @@ msgid "%s was already not hold.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1682,12 +1682,12 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p nytt."
msgid "Merging available information"
msgstr "Flettar informasjon om tilgjengelege pakkar"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s er ingen gyldig DEB-pakke."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1711,12 +1711,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Klarte ikkje skriva til %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
@@ -2502,12 +2502,12 @@ msgstr "Underprosessen %s mottok ein segmenteringsfeil."
msgid "Sub-process %s received signal %u."
msgstr "Underprosessen %s mottok ein segmenteringsfeil."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprosessen %s returnerte ein feilkode (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprosessen %s avslutta uventa"
@@ -2560,7 +2560,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Avbryt installasjon."
@@ -2885,17 +2885,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Skjnar ikkje spikringstypen %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) oppgitt for spiker"
@@ -3253,12 +3253,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 11ca59961..7f42430fa 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -163,8 +163,8 @@ msgid " Version table:"
msgstr " Tabela wersji:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -544,11 +544,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:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Obsługiwane moduły:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -662,7 +662,7 @@ msgid "%s was already not hold.\n"
msgstr "%s został już odznaczony jako zatrzymany.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1766,12 +1766,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Łączenie informacji o dostępnych pakietach"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s nie jest prawidłowym pakietem DEB."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1795,12 +1795,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Nie udało się pisać do %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?"
@@ -2601,12 +2601,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s zakończył się niespodziewanie"
@@ -2659,7 +2659,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Brak zainstalowanej bazy kluczy w %s."
@@ -2986,17 +2986,17 @@ msgstr ""
"Wartość %s jest nieprawidłowa dla APT::Default-Release, ponieważ takie "
"wydanie nie jest dostępne w źródłach"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nierozpoznany typ przypinania %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Brak (lub zerowy) priorytet przypięcia"
@@ -3375,12 +3375,12 @@ msgstr ""
msgid "Execute external solver"
msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Uruchamianie dpkg"
diff --git a/po/pt.po b/po/pt.po
index 63df48f99..2ca93d930 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -159,8 +159,8 @@ msgid " Version table:"
msgstr " Tabela de Versão:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -538,11 +538,11 @@ msgstr "Falhou processar as dependências de compilação"
msgid "Changelog for %s (%s)"
msgstr "Changlog para %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -658,7 +658,7 @@ msgid "%s was already not hold.\n"
msgstr "%s já estava para não manter.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1740,12 +1740,12 @@ msgstr ""
msgid "Merging available information"
msgstr "A juntar a informação disponível"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s não é um pacote DEB válido."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1770,12 +1770,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Não conseguiu escrever para %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Não pode obter a versão do debconf. O debconf está instalado?"
@@ -2578,12 +2578,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "O sub-processo %s terminou inesperadamente"
@@ -2636,7 +2636,7 @@ msgid "Problem syncing the file"
msgstr "Problema sincronizando o ficheiro"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Nenhum keyring instalado em %s."
@@ -2969,17 +2969,17 @@ msgstr ""
"O valor '%s' é inválido para APT::Default-Release porque tal lançamento não "
"está disponível nas fontes"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Registo inválido no ficheiro de preferências %s, sem cabeçalho Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Não foi possível entender o tipo de marca (pin) %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
@@ -3366,12 +3366,12 @@ msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
msgid "Execute external solver"
msgstr "Executar resolvedor externo"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "A correr o dpkg"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 71ef726f1..05027f37c 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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."
@@ -159,8 +159,8 @@ msgid " Version table:"
msgstr " Tabela de versão:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -532,11 +532,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:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Módulos para os quais há suporte:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -650,7 +650,7 @@ msgid "%s was already not hold.\n"
msgstr "%s já é a versão mais nova.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1711,12 +1711,12 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente"
msgid "Merging available information"
msgstr "Mesclando informação disponível"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s não é um pacote DEB válido."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1741,12 +1741,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Impossível escrever para %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?"
@@ -2541,12 +2541,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Sub-processo %s finalizou inesperadamente"
@@ -2599,7 +2599,7 @@ msgid "Problem syncing the file"
msgstr "Problema sincronizando o arquivo"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Abortando instalação."
@@ -2928,17 +2928,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Não foi possível entender o tipo de \"pin\" %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\""
@@ -3305,12 +3305,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 45b497aaf..7f36345dd 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -160,8 +160,8 @@ msgid " Version table:"
msgstr " Tabela de versiuni:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -530,11 +530,11 @@ msgstr "Eșec la prelucrarea dependențelor de compilare"
msgid "Changelog for %s (%s)"
msgstr "Conectare la %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -649,7 +649,7 @@ msgid "%s was already not hold.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1713,12 +1713,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Se combină informațiile disponibile"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s nu este un pachet DEB valid."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1742,12 +1742,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Nu s-a putut scrie în %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?"
@@ -2550,12 +2550,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Subprocesul %s s-a terminat brusc"
@@ -2608,7 +2608,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Abandonez instalarea."
@@ -2932,17 +2932,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nu s-a înțeles tipul de pin %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Fără prioritate (sau zero) specificată pentru pin"
@@ -3310,12 +3310,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index e1685ee00..74e1e9ee3 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -164,8 +164,8 @@ msgid " Version table:"
msgstr " Таблица версий:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -539,11 +539,11 @@ msgstr "Обработка зависимостей для сборки заве
msgid "Changelog for %s (%s)"
msgstr "Changelog для %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -661,7 +661,7 @@ msgid "%s was already not hold.\n"
msgstr "%s уже помечен как не зафиксированный.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1759,12 +1759,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Слияние доступной информации"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s не является правильным DEB-пакетом."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1787,12 +1787,12 @@ msgstr ""
" -c=? Читать указанный файл настройки\n"
" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Невозможно записать в %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Невозможно определить версию debconf. Он установлен?"
@@ -2601,12 +2601,12 @@ msgstr ""
msgid "Sub-process %s received signal %u."
msgstr "Порождённый процесс %s получил сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Порождённый процесс %s вернул код ошибки (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Порождённый процесс %s неожиданно завершился"
@@ -2660,7 +2660,7 @@ msgid "Problem syncing the file"
msgstr "Проблема при синхронизации файла"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Связка ключей в %s не установлена."
@@ -2988,17 +2988,17 @@ msgstr ""
"Значение «%s» недопустимо для APT::Default-Release, так как выпуск "
"недоступен в источниках"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Неизвестный тип фиксации %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Для фиксации не указан приоритет (или указан нулевой)"
@@ -3379,12 +3379,12 @@ msgstr "Внешний решатель завершился с ошибкой
msgid "Execute external solver"
msgstr "Запустить внешний решатель"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Запускается dpkg"
diff --git a/po/sk.po b/po/sk.po
index 2fcc761f9..a1a2aff50 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -160,8 +160,8 @@ msgid " Version table:"
msgstr " Tabuľka verzií:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -532,11 +532,11 @@ msgstr "Spracovanie závislostí na zostavenie zlyhalo"
msgid "Changelog for %s (%s)"
msgstr "Záznam zmien %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -650,7 +650,7 @@ msgid "%s was already not hold.\n"
msgstr "%s bol už nastavený na nepodržanie.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1731,12 +1731,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Zlučujú sa dostupné informácie"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s nie je platný balík DEB."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1760,12 +1760,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Do %s sa nedá zapisovať"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?"
@@ -2557,12 +2557,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Podproces %s neočakávane skončil"
@@ -2615,7 +2615,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
@@ -2937,17 +2937,17 @@ msgstr ""
"„%s“ nie je platná hodnota pre APT::Default-Release, pretože také vydanie "
"nie je dostupné v zdrojoch"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Nezrozumiteľné pridržanie typu %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
@@ -3320,12 +3320,12 @@ msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
msgid "Execute external solver"
msgstr "Spustiť externého riešiteľa"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Spúšťa sa dpkg"
diff --git a/po/sl.po b/po/sl.po
index 7ec61ca28..ebf149be0 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -158,8 +158,8 @@ msgid " Version table:"
msgstr " Preglednica različic:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -529,11 +529,11 @@ msgstr "Obdelava odvisnosti za gradnjo je spodletela"
msgid "Changelog for %s (%s)"
msgstr "Dnevnik sprememb za %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -646,7 +646,7 @@ msgid "%s was already not hold.\n"
msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1731,12 +1731,12 @@ msgstr "nad tem sporočilom. Popravite jih in poženite Namest[I]tev še enkrat"
msgid "Merging available information"
msgstr "Združevanje razpoložljivih podaktov"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s ni veljaven paket DEB."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1760,12 +1760,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Ni mogoče pisati na %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?"
@@ -2558,12 +2558,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Pod-opravilo %s se je nepričakovano zaključilo"
@@ -2616,7 +2616,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "V %s ni nameščenih zbirk ključev."
@@ -2943,17 +2943,17 @@ msgstr ""
"Vrednost '%s' je neveljavna za APT::Default-Release in zato takšna izdaja ni "
"na voljo v virih"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Neveljaven zapis v datoteki možnosti %s, ni glave paketa"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Ni mogoče razumeti vrste bucike %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Prednost bucike ni navedena ali pa je nič."
@@ -3325,12 +3325,12 @@ msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
msgid "Execute external solver"
msgstr "Izvedi zunanji reševalnik"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Poganjanje dpkg"
diff --git a/po/sv.po b/po/sv.po
index 887d4d1a9..57da1162d 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -158,8 +158,8 @@ msgid " Version table:"
msgstr " Versionstabell:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -531,11 +531,11 @@ msgstr "Misslyckades med att behandla byggberoenden"
msgid "Changelog for %s (%s)"
msgstr "Ansluter till %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -649,7 +649,7 @@ msgid "%s was already not hold.\n"
msgstr "%s är redan den senaste versionen.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1723,12 +1723,12 @@ msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera ig
msgid "Merging available information"
msgstr "Sammanfogar tillgänglig information"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s är inte ett giltigt DEB-paket."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1752,12 +1752,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Kunde inte skriva till %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
@@ -2555,12 +2555,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Underprocessen %s svarade med en felkod (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Underprocessen %s avslutades oväntat"
@@ -2613,7 +2613,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Ingen nyckelring installerad i %s."
@@ -2941,17 +2941,17 @@ msgid ""
msgstr ""
# "Package" är en sträng i konfigurationsfilen
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Ogiltig post i konfigurationsfilen %s, \"Package\"-rubriken saknas"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Förstod inte nåltypen %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Prioritet ej angiven (eller noll) för nål"
@@ -3323,12 +3323,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Kör dpkg"
diff --git a/po/th.po b/po/th.po
index cfe1e39a1..509107d08 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -156,8 +156,8 @@ msgid " Version table:"
msgstr " ตารางรุ่น:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -517,11 +517,11 @@ msgstr "ติดตั้งสิ่งที่จำเป็นสำหร
msgid "Changelog for %s (%s)"
msgstr "ปูมการแก้ไขสำหรับ %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "มอดูลที่รองรับ:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -634,7 +634,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1682,12 +1682,12 @@ msgstr "กรุณาแก้ปัญหาเหล่านั้น แ
msgid "Merging available information"
msgstr "กำลังผสานรายชื่อของแพกเกจที่มี"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s ไม่ใช่แพกเกจ DEB ที่ใช้การได้"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1711,12 +1711,12 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งนี้\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
@@ -2498,12 +2498,12 @@ msgstr "โพรเซสย่อย %s เกิดข้อผิดพล
msgid "Sub-process %s received signal %u."
msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน"
@@ -2556,7 +2556,7 @@ msgid "Problem syncing the file"
msgstr "เกิดปัญหาขณะ sync แฟ้ม"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
@@ -2876,17 +2876,17 @@ msgid ""
"available in the sources"
msgstr "ค่า '%s' ไม่สามารถใช้กับ APT::Default-Release ได้ เนื่องจากรุ่นดังกล่าวไม่มีในแหล่ง"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง %s: ไม่มีข้อมูลส่วนหัว 'Package'"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "ไม่เข้าใจชนิดการตรึง %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
@@ -3247,12 +3247,12 @@ msgstr "กลไกการแก้ปัญหาภายนอกทำง
msgid "Execute external solver"
msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "กำลังเรียก dpkg"
diff --git a/po/tl.po b/po/tl.po
index f49b40347..05d606f97 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -162,8 +162,8 @@ msgid " Version table:"
msgstr " Talaang Bersyon:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -531,11 +531,11 @@ msgstr "Bigo sa pagproseso ng build dependencies"
msgid "Changelog for %s (%s)"
msgstr "Kumokonekta sa %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -646,7 +646,7 @@ msgid "%s was already not hold.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1697,12 +1697,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Pinagsasama ang magagamit na impormasyon"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s ay hindi balido na paketeng DEB."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1726,12 +1726,12 @@ 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:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Hindi makapagsulat sa %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
@@ -2533,12 +2533,12 @@ 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:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, 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:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Ang sub-process %s ay lumabas ng di inaasahan"
@@ -2591,7 +2591,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Ina-abort ang pag-instol."
@@ -2918,17 +2918,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Hindi naintindihan ang uri ng pin %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
@@ -3293,12 +3293,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index d0f7ccea4..beead72f9 100644
--- a/po/tr.po
+++ b/po/tr.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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\n"
"PO-Revision-Date: 2013-02-18 03:41+0200\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian l10n Turkish\n"
@@ -160,8 +160,8 @@ msgid " Version table:"
msgstr " Sürüm çizelgesi:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -532,11 +532,11 @@ msgstr "İnşa bağımlılıklarını işleme başarısız oldu"
msgid "Changelog for %s (%s)"
msgstr "%s (%s) paketinin değişim günlüğü"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Desteklenen birimler:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -652,7 +652,7 @@ msgid "%s was already not hold.\n"
msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1731,12 +1731,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Kullanılabilir bilgiler birleştiriliyor"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s geçerli bir DEB paketi değil."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1760,12 +1760,12 @@ msgstr ""
" -c=? Belirtilen ayar dosyasını kullanır\n"
" -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "%s dosyasına yazılamıyor"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf sürümü alınamıyor. debconf kurulu mu?"
@@ -2567,12 +2567,12 @@ msgstr "%s altsüreci bir bölümleme hatası aldı (segmentation fault)."
msgid "Sub-process %s received signal %u."
msgstr "%s altsüreci %u sinyali aldı"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "%s altsüreci bir hata kodu gönderdi (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "%s altsüreci beklenmeyen bir şekilde sona erdi"
@@ -2625,7 +2625,7 @@ msgid "Problem syncing the file"
msgstr "Dosya eşitlenirken sorun çıktı"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "%s dizininde kurulu bir anahtar yok."
@@ -2963,17 +2963,17 @@ msgstr ""
"APT::Default-Release için '%s' değeri geçersizdir, çünkü kaynaklarda böyle "
"bir sürüm yok."
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "%s tercihler dosyasında geçersiz kayıt, Paket başlığı yok"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "İğne türü %s anlaşılamadı"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "İğne için öncelik belirlenmedi (ya da sıfır)"
@@ -3340,12 +3340,12 @@ msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız ol
msgid "Execute external solver"
msgstr "Harici çözücüyü çalıştır"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "dpkg çalıştırılıyor"
diff --git a/po/uk.po b/po/uk.po
index fb069dcdf..a6858646e 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -165,8 +165,8 @@ msgid " Version table:"
msgstr " Таблиця версій:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -540,11 +540,11 @@ msgstr "Обробка залежностей для побудови закін
msgid "Changelog for %s (%s)"
msgstr "Журнал змін для %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -662,7 +662,7 @@ msgid "%s was already not hold.\n"
msgstr "%s вже був незафіксований.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1752,12 +1752,12 @@ msgstr ""
msgid "Merging available information"
msgstr "Об'єднання доступної інформації"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s не є правильним DEB пакунком."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1781,12 +1781,12 @@ msgstr ""
" -c=? Читати зазначений конфігураційний файл\n"
" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Неможливо записати в %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Неможливо визначити версію debconf. Він встановлений?"
@@ -2602,12 +2602,12 @@ msgstr "Підпроцес %s отримав 'segmentation fault' (фаталь
msgid "Sub-process %s received signal %u."
msgstr "Підпроцес %s отримав сигнал %u."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Підпроцес %s повернув код помилки (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Підпроцес %s раптово завершився"
@@ -2660,7 +2660,7 @@ msgid "Problem syncing the file"
msgstr "Проблема з синхронізацією файла"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Не встановлено 'keyring' у %s."
@@ -2986,17 +2986,17 @@ msgstr ""
"Невірне значення '%s' для APT::Default-Release, так як такий випуск не є "
"доступним у вихідних кодах"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Невірний запис у файлі налаштувань %s, відсутній заголовок Package"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Не зрозумів тип %s для фіксатора пакунків (pin)"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)"
@@ -3374,12 +3374,12 @@ msgstr ""
msgid "Execute external solver"
msgstr "Виконати зовнішній розв'язувач"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Виконується dpkg"
diff --git a/po/vi.po b/po/vi.po
index be7c0c7bd..905cadd43 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,22 +1,23 @@
# Vietnamese Translation for Apt.
+# Bản dịch tiếng Việt dành cho Apt.
# This file is put in the public domain.
# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006, 2007, 2008, 2009, 2010.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: apt-0.9.11\n"
+"Project-Id-Version: apt 0.9.14.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-12 18:37+0100\n"
-"PO-Revision-Date: 2013-08-25 14:13+0700\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\n"
+"PO-Revision-Date: 2014-01-01 13:45+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Team-Website: <http://translationproject.org/team/vi.html>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
"X-Generator: Poedit 1.5.5\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: ../\n"
@@ -88,7 +89,7 @@ msgstr "Tổng chỗ phiên bản phụ thuộc: "
#: cmdline/apt-cache.cc:358
msgid "Total slack space: "
-msgstr "Tổng chỗ nghỉ: "
+msgstr "Tổng chỗ trống: "
#: cmdline/apt-cache.cc:366
msgid "Total space accounted for: "
@@ -114,7 +115,7 @@ msgstr "Bạn phải đưa ra ít nhất một mẫu tìm kiếm"
#: cmdline/apt-cache.cc:1411
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-"Lệnh này đã lạc hậu. Xin hãy dùng lệnh 'apt-mark showauto' để thay thế."
+"Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark showauto” để thay thế."
#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574
#, c-format
@@ -149,7 +150,7 @@ msgstr " Ứng cử: "
#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
msgid "(none)"
-msgstr "(không có)"
+msgstr "(không)"
#: cmdline/apt-cache.cc:1611
msgid " Package pin: "
@@ -161,8 +162,8 @@ msgid " Version table:"
msgstr " Bảng phiên bản:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -235,7 +236,7 @@ msgstr ""
" -h Trợ giúp này.\n"
" -p=? Bộ nhớ tạm gói.\n"
" -s=? Bộ nhớ tạm nguồn.\n"
-" -q Tắt cái chỉ tiến trình.\n"
+" -q Không hiển thị diễn tiến.\n"
" -i Chỉ hiển thị những phụ thuộc quan trọng cho lệnh unmet.\n"
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. -o dir::cache=/tmp\n"
@@ -251,7 +252,7 @@ msgid ""
msgstr ""
"Không tìm thấy CD-ROM bằng cách dò tìm hay sử dụng điểm gắn mặc định.\n"
"Bạn có lẽ nên dùng tùy chọn --cdrom để đặt điểm gắn CD-ROM.\n"
-"Xem 'man apt-cdrom' để có thêm thông tin về tự động dò tìm và điểm gắn CD-"
+"Xem “man apt-cdrom” để có thêm thông tin về tự động dò tìm và điểm gắn CD-"
"ROM."
#: cmdline/apt-cdrom.cc:89
@@ -303,22 +304,22 @@ msgstr ""
"Tùy chọn:\n"
" -h Trợ giúp này\n"
" -c=? Đọc tập tin cấu hình này\n"
-" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
+" -o=? Đặt một tùy chọn cấu hình tùy ý, ví dụ -o dir::cache=/tmp\n"
#: cmdline/apt-get.cc:244
-#, fuzzy, c-format
+#, c-format
msgid "Can not find a package for architecture '%s'"
-msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”"
+msgstr "Không tìm thấy gói cho kiến trúc “%s”"
#: cmdline/apt-get.cc:326
-#, fuzzy, c-format
+#, c-format
msgid "Can not find a package '%s' with version '%s'"
-msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”"
+msgstr "Không tìm thấy gói “%s” với phiên bản “%s”"
#: cmdline/apt-get.cc:329
-#, fuzzy, c-format
+#, c-format
msgid "Can not find a package '%s' with release '%s'"
-msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”"
+msgstr "Không tìm thấy gói “%s” với số phát hành “%s”"
#: cmdline/apt-get.cc:366
#, c-format
@@ -326,9 +327,9 @@ msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Đang chọn “%s” làm gói nguồn, thay thế cho “%s”\n"
#: cmdline/apt-get.cc:422
-#, fuzzy, c-format
+#, c-format
msgid "Can not find version '%s' of package '%s'"
-msgstr "Bỏ qua phiên bản không sẵn sàng “%s” của gói “%s”"
+msgstr "Không tìm thấy phiên bản “%s” của gói “%s”"
#: cmdline/apt-get.cc:453
#, c-format
@@ -350,7 +351,7 @@ msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-"Lệnh này đã lỗi thời. Xin hãy dùng lệnh 'apt-mark auto' và 'apt-mark manual' "
+"Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark auto” và “apt-mark manual” "
"để thay thế."
#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
@@ -452,7 +453,7 @@ msgstr "Hãy kiểm tra xem gói “dpkg-dev” đã được cài đặt chưa.
#: cmdline/apt-get.cc:981
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "Lệnh xây dựng “%s” bị lỗi.\n"
+msgstr "Lệnh biên dịch “%s” bị lỗi.\n"
#: cmdline/apt-get.cc:1001
msgid "Child process failed"
@@ -461,7 +462,7 @@ msgstr "Tiến trình con bị lỗi"
#: cmdline/apt-get.cc:1020
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
+"Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch"
#: cmdline/apt-get.cc:1045
#, c-format
@@ -475,12 +476,12 @@ msgstr ""
#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
+msgstr "Không thể lấy thông tin về các phần phụ thuộc khi biên dịch cho %s"
#: cmdline/apt-get.cc:1092
#, c-format
msgid "%s has no build depends.\n"
-msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
+msgstr "%s không phụ thuộc vào gì khi biên dịch.\n"
#: cmdline/apt-get.cc:1262
#, c-format
@@ -488,7 +489,8 @@ msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-"phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên gói '%s'"
+"Phần phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên "
+"gói “%s”"
#: cmdline/apt-get.cc:1280
#, c-format
@@ -496,7 +498,7 @@ msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"cách phụ thuộc %s cho %s không thể được thỏa mãn vì không tìm thấy gói %s"
+"Phần phụ thuộc %s cho %s không thể được thỏa mãn vì không tìm thấy gói %s"
#: cmdline/apt-get.cc:1303
#, c-format
@@ -511,7 +513,7 @@ msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-"cách phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s "
+"phần phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s "
"có thể thỏa mãn điều kiện phiên bản"
#: cmdline/apt-get.cc:1348
@@ -520,7 +522,7 @@ msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-"cách phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản "
+"phần phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản "
"ứng cử"
#: cmdline/apt-get.cc:1371
@@ -531,22 +533,22 @@ msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
#: cmdline/apt-get.cc:1386
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
+msgstr "Không thể thỏa mãn quan hệ phụ thuộc khi biên dịch cho %s."
#: cmdline/apt-get.cc:1391
msgid "Failed to process build dependencies"
-msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
+msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496
#, c-format
msgid "Changelog for %s (%s)"
msgstr "Changelog cho %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "Hỗ trợ các mô-đun:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -612,7 +614,7 @@ msgstr ""
" autoremove - Tự động gỡ bỏ tất cả các gói không dùng\n"
" purge - Gỡ bỏ và tẩy xóa gói\n"
" source - Tải về kho nguồn\n"
-" build-dep - Định cấu hình quan hệ phụ thuộc khi xây dụng, cho gói nguồn\n"
+" build-dep - Định cấu hình quan hệ phụ thuộc khi biên dịch, cho gói nguồn\n"
" dist-upgrade - Nâng cấp hệ điều hành lên phiên bản mới hơn, hãy xem apt-"
"get(8)\n"
" dselect-upgrade - Cho phép chọn dselect\n"
@@ -632,7 +634,7 @@ msgstr ""
" -f Thử sửa chữa một hệ thống có quan hệ phụ thuộc bị sai hỏng\n"
" -m Thử tiếp tục lại nếu không thể xác định vị trí từ kho\n"
" -u Hiển thị danh sách các gói đã nâng cấp\n"
-" -b Xây dụng gói nguồn sau khi lấy nó về\n"
+" -b Biên dịch gói nguồn sau khi lấy nó về\n"
" -V Hiển thị số thứ tự phiên bản dạng chi tiết\n"
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt tùy chọn cấu hình tùy ý, v.d. -o dir::cache=/tmp\n"
@@ -666,7 +668,7 @@ msgid "%s was already not hold.\n"
msgstr "%s đã sẵn được đặt là không giữ lại.\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -685,7 +687,8 @@ msgstr "Hủy bỏ nắm giữ %s.\n"
#: cmdline/apt-mark.cc:334
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-"Thực thi lệnh dpkg gặp lỗi. Bạn có quyền siêu người dùng (root) không vậy?"
+"Thực thi lệnh dpkg gặp lỗi. Bạn có cần quyền siêu người dùng (root) để làm "
+"việc này"
#: cmdline/apt-mark.cc:381
msgid ""
@@ -745,6 +748,19 @@ msgid ""
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
+"Cách dùng: apt [các tùy chọn] lệnh\n"
+"\n"
+"CLI (giao diện dòng lệnh) dành cho apt.\n"
+"Lệnh: \n"
+" list - liệt kê các gói dựa trên cơ sở là tên gói\n"
+" search - tìm trong phần mô tả của gói\n"
+" show - hiển thị thông tin chi tiết về gói\n"
+"\n"
+" update - cập nhật danh sánh các gói sẵn có\n"
+" install - cài đặt các gói\n"
+" upgrade - nâng cấp các gói trong hệ thống\n"
+"\n"
+" edit-sources - sửa tập tin thông tin gói nguồn\n"
#: methods/cdrom.cc:203
#, c-format
@@ -966,7 +982,7 @@ msgstr "Không thể khởi tạo kết nối đến %s:%s (%s)."
#: methods/connect.cc:108
#, 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ờ"
+msgstr "Không thể kết nối đến %s:%s (%s), kết nối bị quá giờ"
#: methods/connect.cc:126
#, c-format
@@ -993,7 +1009,7 @@ msgstr "Việc phân giải “%s” bị lỗi tạm thời"
#: methods/connect.cc:209
#, c-format
msgid "System error resolving '%s:%s'"
-msgstr "Lỗi hệ thống khi phân giải '%s:%s'"
+msgstr "Lỗi hệ thống khi phân giải “%s:%s”"
#: methods/connect.cc:211
#, c-format
@@ -1026,7 +1042,7 @@ msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-"Tập tin Clearsigned không hợp lệ, nhận được '%s' (mạng yêu cầu xác nhận phải "
+"Tập tin Clearsigned không hợp lệ, nhận được “%s” (mạng yêu cầu xác nhận phải "
"không?)"
#: methods/gpgv.cc:183
@@ -1110,11 +1126,11 @@ msgstr "Không rõ định dạng ngày"
#: methods/server.cc:490
msgid "Bad header data"
-msgstr "Dữ liệu dòng đầu sai"
+msgstr "Dữ liệu phần đầu sai"
#: methods/server.cc:507 methods/server.cc:564
msgid "Connection failed"
-msgstr "Kết nối bị ngắt"
+msgstr "Kết nối bị lỗi"
#: methods/server.cc:656
msgid "Internal error"
@@ -1122,7 +1138,7 @@ msgstr "Gặp lỗi nội bộ"
#: apt-private/private-list.cc:143
msgid "Listing"
-msgstr ""
+msgstr "Đang liệt kê"
#: apt-private/private-install.cc:93
msgid "Internal error, InstallPackages was called with broken packages!"
@@ -1199,7 +1215,7 @@ msgid ""
msgstr ""
"Bạn sắp làm việc mà nó có thể gây hư hại cho hệ thống.\n"
"Nếu vẫn muốn tiếp tục thì hãy gõ cụm từ “%s”\n"
-"?]"
+"?] "
#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
msgid "Abort."
@@ -1299,7 +1315,7 @@ msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cầ
#: apt-private/private-install.cc:530
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Hãy dùng lệnh `apt-get autoremove' để gỡ bỏ chúng."
+msgstr[0] "Hãy dùng lệnh “apt-get autoremove” để gỡ bỏ chúng."
#: apt-private/private-install.cc:624
msgid "You might want to run 'apt-get -f install' to correct these:"
@@ -1364,34 +1380,31 @@ msgstr "Gặp lỗi khi lấy về %s %s\n"
#: apt-private/private-output.cc:198
msgid "installed,upgradable to: "
-msgstr ""
+msgstr "đã cài, có thể nâng cấp thành: "
#: apt-private/private-output.cc:204
-#, fuzzy
msgid "[installed,local]"
-msgstr " [Đã cài đặt]"
+msgstr "[đã cài đặt,nội bộ]"
#: apt-private/private-output.cc:207
msgid "[installed,auto-removable]"
-msgstr ""
+msgstr "[đã cài, có thể tự động gỡ bỏ]"
#: apt-private/private-output.cc:209
-#, fuzzy
msgid "[installed,automatic]"
-msgstr " [Đã cài đặt]"
+msgstr "[đã cài đặt,tự động]"
#: apt-private/private-output.cc:211
-#, fuzzy
msgid "[installed]"
-msgstr " [Đã cài đặt]"
+msgstr "[đã cài đặt]"
#: apt-private/private-output.cc:217
msgid "[upgradable from: "
-msgstr ""
+msgstr "[có thể nâng cấp từ: "
#: apt-private/private-output.cc:223
msgid "[residual-config]"
-msgstr ""
+msgstr "[residual-config]"
#: apt-private/private-output.cc:314
msgid "The following packages have unmet dependencies:"
@@ -1417,7 +1430,7 @@ msgstr "nhưng mà nó là gói ảo"
#: apt-private/private-output.cc:418
msgid "but it is not installed"
-msgstr "nhưng mà nó chưa được cài đặt"
+msgstr "nhưng mà nó không được cài đặt"
#: apt-private/private-output.cc:418
msgid "but it is not going to be installed"
@@ -1429,27 +1442,27 @@ msgstr " hay"
#: apt-private/private-output.cc:452
msgid "The following NEW packages will be installed:"
-msgstr "Theo đây có những gói MỚI sẽ được cài đặt:"
+msgstr "Những gói MỚI sau sẽ được cài đặt:"
#: apt-private/private-output.cc:478
msgid "The following packages will be REMOVED:"
-msgstr "Theo đây có những gói sẽ bị GỠ BỎ:"
+msgstr "Những gói sau sẽ bị GỠ BỎ:"
#: apt-private/private-output.cc:500
msgid "The following packages have been kept back:"
-msgstr "Theo đây có những gói đã được giữ lại:"
+msgstr "Những gói sau đây được giữ lại:"
#: apt-private/private-output.cc:521
msgid "The following packages will be upgraded:"
-msgstr "Theo đây có những gói sẽ được nâng cấp:"
+msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
#: apt-private/private-output.cc:542
msgid "The following packages will be DOWNGRADED:"
-msgstr "Theo đây có những gói sẽ được HẠ CẤP:"
+msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
#: apt-private/private-output.cc:562
msgid "The following held packages will be changed:"
-msgstr "Theo đây có những gói sẽ được thay đổi:"
+msgstr "Những gói sau đây sẽ được thay đổi:"
#: apt-private/private-output.cc:617
#, c-format
@@ -1550,7 +1563,7 @@ msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn
#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
msgid "Sorting"
-msgstr ""
+msgstr "Đang sắp xếp"
#: apt-private/private-update.cc:45
msgid "The update command takes no arguments"
@@ -1558,12 +1571,11 @@ msgstr "Lệnh cập nhật không chấp nhận đối số"
#: apt-private/private-upgrade.cc:18
msgid "Calculating upgrade... "
-msgstr "Đang tính bước nâng cấp... "
+msgstr "Đang tính toán nâng cấp... "
#: apt-private/private-upgrade.cc:23
-#, fuzzy
msgid "Internal error, Upgrade broke stuff"
-msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã làm hỏng thứ gì đó"
+msgstr "Lỗi nội bộ: Upgrade (Nâng cấp) đã làm hỏng thứ gì đó"
#: apt-private/private-upgrade.cc:25
msgid "Done"
@@ -1571,11 +1583,11 @@ msgstr "Xong"
#: apt-private/private-search.cc:61
msgid "Full Text Search"
-msgstr ""
+msgstr "Tìm kiếm toàn văn"
#: apt-private/private-show.cc:106
msgid "not a real package (virtual)"
-msgstr ""
+msgstr "không là gói thật (ảo)"
#: apt-private/private-main.cc:19
msgid ""
@@ -1590,18 +1602,18 @@ msgstr ""
" nên có thể nó không chính xác như những gì làm thật!"
#: apt-private/private-sources.cc:41
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse %s. Edit again? "
-msgstr "Việc đổi tên %s thành %s bị lỗi"
+msgstr "Gặp lỗi khi phân tích %s. Sửa lại chứ? "
#: apt-private/private-sources.cc:52
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "Tập tin “%s” của bạn đã thay đổi, hãy chạy lệnh “apt-get update”."
#: apt-private/acqprogress.cc:60
msgid "Hit "
-msgstr "Lần tìm "
+msgstr "Tìm thấy "
#: apt-private/acqprogress.cc:84
msgid "Get:"
@@ -1618,12 +1630,12 @@ msgstr "Lỗi "
#: apt-private/acqprogress.cc:140
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Đã lấy %sB trong tổng số %s (%sB/g).\n"
+msgstr "Đã lấy về %sB mất %s (%sB/g).\n"
#: apt-private/acqprogress.cc:230
#, c-format
msgid " [Working]"
-msgstr " [Hoạt động]"
+msgstr " [Đang hoạt động]"
#: apt-private/acqprogress.cc:291
#, c-format
@@ -1632,9 +1644,9 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"Chuyển đổi thiết bị lưu trữ: hãy nạp đĩa có nhãn\n"
+"Chuyển đổi thiết bị lưu trữ: vui lòng đưa đĩa có nhãn\n"
" “%s”\n"
-"vào ổ “%s” và bấm nút Enter\n"
+"vào ổ “%s” rồi bấm nút Enter\n"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
@@ -1660,19 +1672,19 @@ msgstr "Không thể chuyển đổi sang %s"
#: methods/mirror.cc:280
#, c-format
msgid "No mirror file '%s' found "
-msgstr "Không tìm thấy tập tin nhân bản “%s”"
+msgstr "Không tìm thấy tập tin nhân bản “%s” "
#. 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 "Không thể đọc tập tin mirror '%s'"
+msgstr "Không thể đọc tập tin mirror “%s”"
#: methods/mirror.cc:315
#, c-format
msgid "No entry found in mirror file '%s'"
-msgstr "Không tìm thấy điểm vào trong tập tin mirror '%s'"
+msgstr "Không tìm thấy điểm vào trong tập tin mirror “%s”"
#: methods/mirror.cc:445
#, c-format
@@ -1702,7 +1714,7 @@ msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
#: methods/rsh.cc:340
msgid "Connection closed prematurely"
-msgstr "Kết nối bị đóng quá sớm."
+msgstr "Kết nối bị đóng bất ngờ"
#: dselect/install:33
msgid "Bad default setting!"
@@ -1733,19 +1745,19 @@ msgstr "hoặc lỗi do quan hệ phụ thuộc chưa thoả. Trường hợp n
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-"chỉ những lỗi bên trên thông điệp này còn lại quan trọng. Hãy sửa chữa, sau "
-"đó chạy lại lệnh cài đặt (I)."
+"chỉ những lỗi bên trên thông điệp này là quan trọng. Hãy sửa chữa, sau đó "
+"chạy lại lệnh cà[I] đặt."
#: dselect/update:30
msgid "Merging available information"
-msgstr "Đang hòa trộn các thông tin sẵn sàng..."
+msgstr "Đang hòa trộn các thông tin sẵn có..."
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s không phải là một gói DEB hợp lệ."
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1773,12 +1785,12 @@ 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 tùy ý, v.d. “-o dir::cache=/tmp”\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Không thể ghi vào %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
@@ -1881,7 +1893,7 @@ msgstr ""
"Có thể sử dụng tùy chọn “--source-override” (đè nguồn)\n"
"để ghi rõ tập tin đè nguồn\n"
"\n"
-"Lnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n"
+"Lệnh “packages” (gói) và “sources” (nguồn) nên chạy tại gốc cây.\n"
"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ "
"quy,\n"
"và tập tin đè nên chứa những cờ đè.\n"
@@ -2154,7 +2166,7 @@ msgstr ""
"[sortpkgs: sort packages: sắp xếp các gói]\n"
"\n"
"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
-"Tùy chọn “-s” dùng để ngụ ý kiểu tập tin là gì.\n"
+"Tùy chọn “-s” dùng để ngầm chỉ kiểu tập tin là gì.\n"
"\n"
"Tùy chọn:\n"
" -h Trợ giúp_ này\n"
@@ -2181,7 +2193,7 @@ msgstr "Lỗi kiểm tổng tar, kho bị hỏng"
#: apt-inst/contrib/extracttar.cc:300
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "Không rõ kiểu phần đầu tar %u, bộ phận %s"
+msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s"
#: apt-inst/contrib/arfile.cc:74
msgid "Invalid archive signature"
@@ -2403,7 +2415,7 @@ msgstr "Không tìm thấy vùng chọn %s"
#: apt-pkg/contrib/configuration.cc:503
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Không nhận biết kiểu viết tắt: “%c”"
+msgstr "Không chấp nhận kiểu viết tắt: “%c”"
#: apt-pkg/contrib/configuration.cc:617
#, c-format
@@ -2449,7 +2461,7 @@ msgstr "Gặp lỗi cú pháp %s:%u: Chưa hỗ trợ chỉ thị “%s”"
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-"Gặp lỗi cú pháp %s:%u: chỉ thị `clear' thì yêu cầu một cây tuỳ chọn làm đối "
+"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối "
"số"
#: apt-pkg/contrib/configuration.cc:934
@@ -2516,12 +2528,12 @@ msgstr "Tùy chọn “%s” quá dài"
#: apt-pkg/contrib/cmndline.cc:336
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr "Không hiểu %s: hãy cố dùng true (đúng) hay false (sai)."
+msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)."
#: apt-pkg/contrib/cmndline.cc:386
#, c-format
msgid "Invalid operation %s"
-msgstr "Thao tác không hợp lệ %s"
+msgstr "Thao tác “%s” không hợp lệ"
#: apt-pkg/contrib/cdromutl.cc:56
#, c-format
@@ -2561,43 +2573,43 @@ msgstr "Không thể lấy khóa %s"
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-"Liệt kê các tập tin không thể được tạo ra vì '%s' không phải là một thư mục"
+"Liệt kê các tập tin không thể được tạo ra vì “%s” không phải là một thư mục"
#: apt-pkg/contrib/fileutl.cc:432
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr "Bỏ qua '%s' trong thư mục '%s'vì nó không phải là tập tin bình thường"
+msgstr "Bỏ qua “%s” trong thư mục “%s'vì nó không phải là tập tin bình thường"
#: apt-pkg/contrib/fileutl.cc:450
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-"Bỏ qua tập tin '%s' trong thư mục '%s' vì nó không có phần đuôi mở rộng"
+"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó không có phần đuôi mở rộng"
#: apt-pkg/contrib/fileutl.cc:459
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-"Bỏ qua tập tin '%s' trong thư mục '%s' vì nó có phần đuôi mở rộng không hợp "
+"Bỏ qua tập tin “%s” trong thư mục “%s” vì nó có phần đuôi mở rộng không hợp "
"lệ"
#: apt-pkg/contrib/fileutl.cc:862
#, c-format
msgid "Sub-process %s received a segmentation fault."
-msgstr "Tiến trình phụ %s đã nhận một lỗi chia ra từng đoạn."
+msgstr "Tiến trình con %s đã nhận một lỗi phân đoạn."
#: apt-pkg/contrib/fileutl.cc:864
#, c-format
msgid "Sub-process %s received signal %u."
msgstr "Tiến trình con %s đã nhận tín hiệu %u."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Tiến trình con %s đã trả về một mã lỗi (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Tiến trình con %s đã thoát bất thường"
@@ -2618,7 +2630,7 @@ msgstr "Việc tạo tiến trình con IPC bị lỗi"
#: apt-pkg/contrib/fileutl.cc:1233
msgid "Failed to exec compressor "
-msgstr "Gặp lỗi khi thực hiện nén"
+msgstr "Gặp lỗi khi thực hiện nén "
#: apt-pkg/contrib/fileutl.cc:1326
#, c-format
@@ -2650,7 +2662,7 @@ 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
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "Không có vòng khoá nào được cài đặt vào %s."
@@ -2678,7 +2690,7 @@ msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên b
#: apt-pkg/pkgcache.cc:172
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"
+msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác"
#: apt-pkg/pkgcache.cc:314
msgid "Depends"
@@ -2706,7 +2718,7 @@ msgstr "Thay thế"
#: apt-pkg/pkgcache.cc:316
msgid "Obsoletes"
-msgstr "Làm cũ"
+msgstr "Cũ"
#: apt-pkg/pkgcache.cc:316
msgid "Breaks"
@@ -2760,7 +2772,7 @@ msgstr "Lỗi mở tập tin tình trạng StateFile %s"
#: apt-pkg/depcache.cc:250
#, c-format
msgid "Failed to write temporary StateFile %s"
-msgstr "Lỗi ghi tập tin tình trạng StateFile tạm thời %s"
+msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s"
#: apt-pkg/tagfile.cc:138
#, c-format
@@ -2776,60 +2788,60 @@ msgstr "Không thể phân tích tập tin gói %s (2)"
#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-"Gặp dòng dạng sai %lu trong danh sách nguồn %s ([tùy chọn] không thể phân "
+"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân "
"tích được)"
#: apt-pkg/sourcelist.cc:99
#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
#: apt-pkg/sourcelist.cc:110
#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-"Gặp dòng dạng sai %lu trong danh sách nguồn %s ([%s] không phải là một phép "
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép "
"gán)"
#: apt-pkg/sourcelist.cc:116
#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-"Gặp dòng dạng sai %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
#: apt-pkg/sourcelist.cc:119
#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-"Gặp dòng dạng sai %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
"trị)"
#: apt-pkg/sourcelist.cc:132
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ URI)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)"
#: apt-pkg/sourcelist.cc:134
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)"
#: apt-pkg/sourcelist.cc:137
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (ngữ pháp URI)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
#: apt-pkg/sourcelist.cc:143
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr ""
-"Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
#: apt-pkg/sourcelist.cc:150
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)"
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)"
#: apt-pkg/sourcelist.cc:248
#, c-format
@@ -2844,7 +2856,7 @@ msgstr "Dòng %u quá dài trong danh sách nguồn %s."
#: apt-pkg/sourcelist.cc:289
#, 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)."
+msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
#: apt-pkg/sourcelist.cc:293
#, c-format
@@ -2863,7 +2875,7 @@ msgstr ""
#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
#, c-format
msgid "Could not configure '%s'. "
-msgstr "Không thể cấu hình '%s'. "
+msgstr "Không thể cấu hình “%s”. "
#: apt-pkg/packagemanager.cc:570
#, c-format
@@ -2981,21 +2993,21 @@ msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
-"Giá trị '%s' không hợp lệ cho APT::Default-Release như vậy bản phát hành "
+"Giá trị “%s” không hợp lệ cho APT::Default-Release như vậy bản phát hành "
"không sẵn có trong mã nguồn"
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
"Gặp mục ghi sai trong tập tin tùy thích %s: không có dòng đầu Package (Gói)."
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Không hiểu kiểu ghim %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
@@ -3071,9 +3083,8 @@ msgid "Size mismatch"
msgstr "Kích cỡ không khớp nhau"
#: apt-pkg/acquire-item.cc:164
-#, fuzzy
msgid "Invalid file format"
-msgstr "Thao tác không hợp lệ %s"
+msgstr "Định dạng tập tập tin không hợp lệ"
#: apt-pkg/acquire-item.cc:1419
#, c-format
@@ -3081,7 +3092,7 @@ msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
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 "
+"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:1435
@@ -3135,7 +3146,7 @@ msgstr ""
#: apt-pkg/acquire-item.cc:1771
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Không tìm thấy nguồn cho việc tải về phiên bản '%s' of '%s'"
+msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”"
#: apt-pkg/acquire-item.cc:1829
#, c-format
@@ -3370,12 +3381,12 @@ msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông t
msgid "Execute external solver"
msgstr "Thi hành bộ phân giải từ bên ngoài"
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
-msgstr ""
+msgstr "Diễn biến: [%3i%%]"
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "Đang chạy dpkg"
@@ -3469,17 +3480,17 @@ msgid "Completely removed %s"
msgstr "Gỡ bỏ hoàn toàn %s"
#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
-#, fuzzy, c-format
+#, c-format
msgid "Can not write log (%s)"
-msgstr "Không thể ghi vào %s"
+msgstr "Không thể ghi nhật ký (%s)"
#: apt-pkg/deb/dpkgpm.cc:1045
msgid "Is /dev/pts mounted?"
-msgstr ""
+msgstr "/dev/pts đã gắn chưa?"
#: apt-pkg/deb/dpkgpm.cc:1066
msgid "Is stdout a terminal?"
-msgstr ""
+msgstr "Đầu ra là thiết bị cuối?"
#: apt-pkg/deb/dpkgpm.cc:1549
msgid "Operation was interrupted before it could finish"
@@ -3519,12 +3530,12 @@ msgstr ""
"bộ nhớ”"
#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
-#, fuzzy
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”"
+"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ "
+"thống nội bộ"
#: apt-pkg/deb/dpkgpm.cc:1665
msgid ""
@@ -3554,7 +3565,7 @@ msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr ""
"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải "
-"vấn đề này."
+"vấn đề này. "
#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
@@ -3573,7 +3584,7 @@ msgstr "Chưa được khoá"
#~ msgstr " [Không phải phiên bản ứng cử]"
#~ msgid "You should explicitly select one to install."
-#~ msgstr "Bạn nên chọn một rõ ràng gói cần cài."
+#~ msgstr "Bạn nên chọn một gói rõ ràng để cài."
#~ msgid ""
#~ "Package %s is not available, but is referred to by another package.\n"
@@ -3595,7 +3606,7 @@ msgstr "Chưa được khoá"
#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
#~ msgstr ""
-#~ "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý bạn là '%s'?\n"
+#~ "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý bạn là “%s'?\n"
#~ msgid "Package '%s' is not installed, so not removed\n"
#~ msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ bỏ nó\n"
@@ -3621,7 +3632,7 @@ msgstr "Chưa được khoá"
#~ msgstr "Đã chọn phiên bản “%s” (%s) cho “%s”\n"
#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-#~ msgstr "Đã chọn phiên bản '%s' (%s) cho '%s' vì '%s'\n"
+#~ msgstr "Đã chọn phiên bản “%s” (%s) cho “%s” vì “%s”\n"
#~ msgid "Ignore unavailable target release '%s' of package '%s'"
#~ msgstr "Bỏ qua bản phát hành đích không sẵn sàng “%s” của gói “%s”"
@@ -3744,13 +3755,13 @@ msgstr "Chưa được khoá"
#~ msgstr "Ghi chú: thay đổi này được tự động làm bởi dpkg."
#~ msgid "Malformed override %s line %lu #1"
-#~ msgstr "Điều đè dạng sai %s dòng %lu #1"
+#~ msgstr "Điều đè sai dạng %s dòng %lu #1"
#~ msgid "Malformed override %s line %lu #2"
-#~ msgstr "Điều đè dạng sai %s dòng %lu #2"
+#~ msgstr "Điều đè sai dạng %s dòng %lu #2"
#~ msgid "Malformed override %s line %lu #3"
-#~ msgstr "Điều đè dạng sai %s dòng %lu #3"
+#~ msgstr "Điều đè sai dạng %s dòng %lu #3"
#~ msgid "decompressor"
#~ msgstr "bộ giải nén"
@@ -3801,10 +3812,47 @@ msgstr "Chưa được khoá"
#~ "là một tập tin)"
#~ msgid "Internal error, could not locate member"
-#~ msgstr "Gặp lỗi nội bộ, không thể định vị bộ phận"
+#~ msgstr "Gặp lỗi nội bộ, không thể định vị thành viên"
#~ msgid "Internal error, group '%s' has no installable pseudo package"
#~ msgstr "Gặp lỗi nội bộ, nhóm “%s” không có gói giả có thể cài đặt"
#~ msgid "Release file expired, ignoring %s (invalid since %s)"
#~ msgstr "Tập tin phát hành đã hết hạn nên bỏ qua %s (không hợp lệ kể từ %s)"
+
+#~ msgid " %4i %s\n"
+#~ msgstr " %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Dòng %d quá dài (tối đa là %lu)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewVersion%d)"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Gặp lỗi khi xử lý thư mục %s"
+
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Dòng %u quá dài trong danh sách nguồn %s."
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc1 - tập tin mô tả mới 1)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc2)"
+
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Việc chọn bị lỗi"
+
+#, fuzzy
+#~ msgid "File date has changed %s"
+#~ msgstr "Không thể chuyển đổi sang %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 867698b14..79ea2286e 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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"
@@ -157,8 +157,8 @@ msgid " Version table:"
msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -520,11 +520,11 @@ msgstr "无法处理构建依赖关系"
msgid "Changelog for %s (%s)"
msgstr "正在连接 %s (%s)"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "支持的模块:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -638,7 +638,7 @@ msgid "%s was already not hold.\n"
msgstr "%s 已经是最新的版本了。\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1666,12 +1666,12 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们,
msgid "Merging available information"
msgstr "正在合并可用信息"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s 不是一个有效的 DEB 软件包。"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1695,12 +1695,12 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
@@ -2486,12 +2486,12 @@ msgstr "子进程 %s 发生了段错误"
msgid "Sub-process %s received signal %u."
msgstr "子进程 %s 收到信号 %u。"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子进程 %s 返回了一个错误号 (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子进程 %s 异常退出"
@@ -2544,7 +2544,7 @@ msgid "Problem syncing the file"
msgstr "同步文件出错"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, c-format
msgid "No keyring installed in %s."
msgstr "%s 中没有安装密钥环。"
@@ -2866,17 +2866,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "首选项文件 %s 中发现有无效的记录,无 Package 字段头"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "无法识别锁定的类型 %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
@@ -3235,12 +3235,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr "正在运行 dpkg"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c57fac84a..dedc5ae49 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-12-12 18:37+0100\n"
+"POT-Creation-Date: 2013-12-29 17:01+0100\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."
@@ -158,8 +158,8 @@ msgid " Version table:"
msgstr " 版本列表:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -515,11 +515,11 @@ msgstr "無法處理編譯相依關係"
msgid "Changelog for %s (%s)"
msgstr "正和 %s (%s) 連線"
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1582
msgid "Supported modules:"
msgstr "已支援模組:"
-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1623
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -631,7 +631,7 @@ msgid "%s was already not hold.\n"
msgstr "%s 已經是最新版本了。\n"
#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
#: apt-pkg/deb/dpkgpm.cc:1178
#, c-format
msgid "Waited for %s but it wasn't there"
@@ -1665,12 +1665,12 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
msgid "Merging available information"
msgstr "整合現有的資料"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "%s 並不是正確的 DEB 套件。"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1694,12 +1694,12 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "無法寫入 %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "無法取得 debconf 版本。是否有安裝 debconf?"
@@ -2485,12 +2485,12 @@ msgstr "子程序 %s 收到一個記憶體錯誤。"
msgid "Sub-process %s received signal %u."
msgstr "子程序 %s 收到一個記憶體錯誤。"
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "子程序 %s 傳回錯誤碼 (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "子程序 %s 不預期得結束"
@@ -2543,7 +2543,7 @@ msgid "Problem syncing the file"
msgstr "在同步檔案時發生問題"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "放棄安裝。"
@@ -2860,17 +2860,17 @@ msgid ""
"available in the sources"
msgstr ""
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "個人設定檔中有些不正確資料,沒有以 Package 開頭"
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "無法分析鎖定類型 %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "銷定並沒有優先順序之分(或零)"
@@ -3224,12 +3224,12 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
diff --git a/test/integration/exploid-keyring-with-dupe-keys.pub b/test/integration/exploid-keyring-with-dupe-keys.pub
deleted file mode 100644
index 642952a40..000000000
--- a/test/integration/exploid-keyring-with-dupe-keys.pub
+++ /dev/null
Binary files differ
diff --git a/test/integration/exploid-keyring-with-dupe-subkeys.pub b/test/integration/exploid-keyring-with-dupe-subkeys.pub
deleted file mode 100644
index 02d4e6ee8..000000000
--- a/test/integration/exploid-keyring-with-dupe-subkeys.pub
+++ /dev/null
Binary files differ
diff --git a/test/integration/framework b/test/integration/framework
index 89b5bb0e4..a28363768 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -102,6 +102,9 @@ aptget() { runapt apt-get $*; }
aptftparchive() { runapt apt-ftparchive $*; }
aptkey() { runapt apt-key $*; }
aptmark() { runapt apt-mark $*; }
+aptwebserver() {
+ LD_LIBRARY_PATH=${APTWEBSERVERBINDIR} ${APTWEBSERVERBINDIR}/aptwebserver $*;
+}
dpkg() {
$(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
}
@@ -154,8 +157,14 @@ setupenvironment() {
TMPWORKINGDIRECTORY=$(mktemp -d)
TESTDIRECTORY=$(readlink -f $(dirname $0))
msgninfo "Preparing environment for ${CCMD}$(basename $0)${CINFO} in ${TMPWORKINGDIRECTORY}… "
- BUILDDIRECTORY="${TESTDIRECTORY}/../../build/bin"
+
+ # allow overriding the default BUILDDIR location
+ BUILDDIRECTORY=${APT_INTEGRATION_TESTS_BUILD_DIR:-"${TESTDIRECTORY}/../../build/bin"}
+ METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"}
+ APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"}
test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
+ # -----
+
addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY;"
cd $TMPWORKINGDIRECTORY
mkdir rootdir aptarchive keys
@@ -181,7 +190,7 @@ setupenvironment() {
echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
echo "Debug::NoLocking \"true\";" >> aptconfig.conf
echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
- echo "Dir::Bin::Methods \"${BUILDDIRECTORY}/methods\";" >> aptconfig.conf
+ echo "Dir::Bin::Methods \"${METHODSDIR}\";" >> aptconfig.conf
echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf
echo "DPKG::options:: \"dpkg\";" >> aptconfig.conf
echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
@@ -822,9 +831,9 @@ changetowebserver() {
shift
fi
local LOG='/dev/null'
- if test -x ${BUILDDIRECTORY}/aptwebserver; then
+ if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then
cd aptarchive
- LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1
+ aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1
local PID="$(cat aptwebserver.pid)"
if [ -z "$PID" ]; then
msgdie 'Could not fork aptwebserver successfully'
diff --git a/test/integration/keyrings/test-archive-keyring.pub b/test/integration/keyrings/test-archive-keyring.pub
new file mode 100644
index 000000000..d8d9d472b
--- /dev/null
+++ b/test/integration/keyrings/test-archive-keyring.pub
Binary files differ
diff --git a/test/integration/keyrings/test-archive-keyring.sec b/test/integration/keyrings/test-archive-keyring.sec
new file mode 100644
index 000000000..aece750e8
--- /dev/null
+++ b/test/integration/keyrings/test-archive-keyring.sec
Binary files differ
diff --git a/test/integration/keyrings/test-master-keyring.pub b/test/integration/keyrings/test-master-keyring.pub
new file mode 100644
index 000000000..33aa16796
--- /dev/null
+++ b/test/integration/keyrings/test-master-keyring.pub
Binary files differ
diff --git a/test/integration/keyrings/test-master-keyring.sec b/test/integration/keyrings/test-master-keyring.sec
new file mode 100644
index 000000000..9cb33176c
--- /dev/null
+++ b/test/integration/keyrings/test-master-keyring.sec
Binary files differ
diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
index 73545aff7..4b38cd9b5 100755
--- a/test/integration/test-apt-key-net-update
+++ b/test/integration/test-apt-key-net-update
@@ -6,109 +6,38 @@ TESTDIR=$(readlink -f $(dirname $0))
setupenvironment
configarchitecture "i386"
+changetowebserver
-# mock
-requires_root() {
- return 0
-}
+# setup env
+mkdir -p var/lib/apt/keyrings
+mkdir -p usr/share/keyrings
-# extract net_update() and import it
-func=$( sed -n -e '/^add_keys_with_verify_against_master_keyring/,/^}/p' ${BUILDDIRECTORY}/apt-key )
-eval "$func"
+# install the fake master keyring
+install -m0644 keys/test-master-keyring.pub usr/share/keyrings
+echo "APT::Key::MasterKeyring \"${TMPWORKINGDIRECTORY}/usr/share/keyrings/test-master-keyring.pub\";" >> ./aptconfig.conf
-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"
+# setup archive-keyring
+mkdir -p aptarchive/ubuntu/project
+install -m0644 keys/test-archive-keyring.pub aptarchive/ubuntu/project/
+echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/test-archive-keyring.pub";' >> ./aptconfig.conf
+echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
-# FIXME: instead of copying this use apt-key and the buildin apt webserver
-# to do a real test
+# test against the "real" webserver
+testequal 'Checking for new archive signing keys now
+gpg: key F68C85A3: public key "Test Automatic Archive Signing Key <ftpmaster@example.com>" imported
+gpg: Total number processed: 1
+gpg: imported: 1 (RSA: 1)' aptkey --fakeroot net-update
-# COPYIED from apt-key.in --------------
-# gpg needs a trustdb to function, but it can't be invalid (not even empty)
-# so we create a temporary directory to store our fresh readable trustdb in
-TRUSTDBDIR="$(mktemp -d)"
-CURRENTTRAP="${CURRENTTRAP} rm -rf '${TRUSTDBDIR}';"
-trap "${CURRENTTRAP}" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
-chmod 700 "$TRUSTDBDIR"
-# We also don't use a secret keyring, of course, but gpg panics and
-# implodes if there isn't one available - and writeable for imports
-SECRETKEYRING="${TRUSTDBDIR}/secring.gpg"
-touch $SECRETKEYRING
-GPG_CMD="$GPG_CMD --secret-keyring $SECRETKEYRING"
-GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg"
-#----------------------------------------- END COPY
+# now try a different one
+# setup archive-keyring
+mkdir -p aptarchive/ubuntu/project
+install -m0644 keys/marvinparanoid.pub aptarchive/ubuntu/project/
+echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/marvinparanoid.pub";' >> ./aptconfig.conf
+echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
-GPG="$GPG_CMD --keyring $TRUSTEDFILE"
-MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
+# test against the "real" webserver
+testequal "Checking for new archive signing keys now
+Key 'E8525D47528144E2' not added. It is not signed with a master key" aptkey --fakeroot net-update
-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-728500-tempdir b/test/integration/test-bug-728500-tempdir
new file mode 100755
index 000000000..0606538a1
--- /dev/null
+++ b/test/integration/test-bug-728500-tempdir
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'i386'
+
+buildsimplenativepackage 'coolstuff' 'all' '1.0' 'unstable'
+
+setupaptarchive
+changetowebserver
+
+msgtest 'Test with incorect TMPDIR'
+export TMPDIR=/does-not-exists
+aptget update && msgpass || msgfail
+unset TMPDIR \ No newline at end of file
diff --git a/test/integration/test-bug-732746-preferences b/test/integration/test-bug-732746-preferences
new file mode 100755
index 000000000..b31f98aa0
--- /dev/null
+++ b/test/integration/test-bug-732746-preferences
@@ -0,0 +1,32 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'i386'
+
+insertinstalledpackage 'bar' 'i386' '1.0'
+
+cat > rootdir/etc/apt/preferences << EOF
+# random test comment header
+
+# commented out by puppy^Wpuppet
+#Package: foo
+#Pin: origin "ftp.debian.org"
+#Pin: 800
+
+Package: bar
+Pin: version 1.0
+Pin-Priority: 700
+
+#Package: bar
+#Pin: version 1.0
+#Pin: 800
+EOF
+
+testequal "Reading package lists...
+Building dependency tree..." aptget check
+
+msgtest "Ensure policy is applied"
+aptcache policy bar|grep -q "*** 1.0 700" && msgpass || msgfail
diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc
index b6b8ac579..462bdefd9 100644
--- a/test/libapt/fileutl_test.cc
+++ b/test/libapt/fileutl_test.cc
@@ -38,5 +38,18 @@ int main(int argc,char *argv[])
return 1;
}
+ // GetTempDir()
+ unsetenv("TMPDIR");
+ equals(GetTempDir(), "/tmp");
+
+ setenv("TMPDIR", "", 1);
+ equals(GetTempDir(), "/tmp");
+
+ setenv("TMPDIR", "/not-there-no-really-not", 1);
+ equals(GetTempDir(), "/tmp");
+
+ setenv("TMPDIR", "/usr", 1);
+ equals(GetTempDir(), "/usr");
+
return 0;
}
diff --git a/vendor/getinfo b/vendor/getinfo
index ac816e10e..861fd3d17 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -24,9 +24,9 @@ debian-stable-codename)
getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
;;
ubuntu-codename)
- getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
+ getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
;;
-keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri)
+keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-distro-codename)
getfield "$1"
;;
*)
diff --git a/vendor/raspbian/apt-vendor.ent b/vendor/raspbian/apt-vendor.ent
new file mode 100644
index 000000000..e359d2001
--- /dev/null
+++ b/vendor/raspbian/apt-vendor.ent
@@ -0,0 +1,7 @@
+<!-- details about the keys used by the distribution -->
+<!ENTITY keyring-distro "Raspbian">
+<!ENTITY keyring-package "<package>raspbian-archive-keyring</package>">
+<!ENTITY keyring-filename "<filename>/usr/share/keyrings/raspbian-archive-keyring.gpg</filename>">
+<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/raspbian-archive-removed-keys.gpg</filename>">
+<!ENTITY keyring-master-filename "">
+<!ENTITY keyring-uri "">
diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile
new file mode 100644
index 000000000..ced566c30
--- /dev/null
+++ b/vendor/raspbian/makefile
@@ -0,0 +1,11 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=vendor/raspbian
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+doc binary manpages: sources.list
+
+sources.list: sources.list.in ../../doc/apt-verbatim.ent
+ sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@
diff --git a/vendor/raspbian/sources.list.in b/vendor/raspbian/sources.list.in
new file mode 100644
index 000000000..29ddcc4d6
--- /dev/null
+++ b/vendor/raspbian/sources.list.in
@@ -0,0 +1,6 @@
+# See sources.list(5) manpage for more information
+# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
+deb http://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free
+
+# Uncomment if you want the apt-get source function to work
+#deb-src http://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free
diff --git a/vendor/steamos/apt-vendor.ent b/vendor/steamos/apt-vendor.ent
new file mode 100644
index 000000000..69bb254ef
--- /dev/null
+++ b/vendor/steamos/apt-vendor.ent
@@ -0,0 +1,8 @@
+<!-- details about the keys used by the distribution -->
+<!ENTITY keyring-distro "SteamOS">
+<!ENTITY keyring-package "<package>valve-archive-keyring</package>">
+<!ENTITY keyring-filename "<filename>/usr/share/keyrings/valve-archive-keyring.gpg</filename>">
+<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/valve-archive-removed-keys.gpg</filename>">
+<!ENTITY current-distro-codename "alchemist">
+<!ENTITY keyring-master-filename "">
+<!ENTITY keyring-uri "">
diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile
new file mode 100644
index 000000000..c27494587
--- /dev/null
+++ b/vendor/steamos/makefile
@@ -0,0 +1,11 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=vendor/steamos
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+doc binary manpages: sources.list
+
+sources.list: sources.list.in ../../doc/apt-verbatim.ent
+ sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@
diff --git a/vendor/steamos/sources.list.in b/vendor/steamos/sources.list.in
new file mode 100644
index 000000000..fed6c3818
--- /dev/null
+++ b/vendor/steamos/sources.list.in
@@ -0,0 +1,5 @@
+# See sources.list(5) manpage for more information
+# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
+
+deb http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free
+deb-src http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free
diff --git a/vendor/ubuntu/sources.list.in b/vendor/ubuntu/sources.list.in
index b9aa8c3d0..00db2f8cd 100644
--- a/vendor/ubuntu/sources.list.in
+++ b/vendor/ubuntu/sources.list.in
@@ -1,5 +1,5 @@
- # See sources.list(5) manpage for more information
- # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
+# See sources.list(5) manpage for more information
+# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted