summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-inst/dirstream.cc9
-rw-r--r--apt-pkg/acquire-item.cc9
-rw-r--r--apt-pkg/cdrom.cc155
-rw-r--r--apt-pkg/cdrom.h4
-rw-r--r--apt-pkg/contrib/fileutl.cc12
-rw-r--r--apt-pkg/init.cc2
-rw-r--r--apt-private/private-output.cc3
-rw-r--r--cmdline/apt-cdrom.cc76
-rw-r--r--cmdline/apt-get.cc10
-rw-r--r--cmdline/apt.cc2
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog24
-rw-r--r--debian/control2
-rw-r--r--debian/libapt-pkg4.12.symbols21
-rw-r--r--debian/tests/control3
-rw-r--r--debian/tests/run-tests5
-rw-r--r--doc/Doxyfile.in2
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot6
-rw-r--r--doc/po/de.po4
-rw-r--r--doc/po/es.po4
-rw-r--r--doc/po/fr.po4
-rw-r--r--doc/po/it.po4
-rw-r--r--doc/po/ja.po4
-rw-r--r--doc/po/pl.po4
-rw-r--r--doc/po/pt.po4
-rw-r--r--doc/po/pt_BR.po4
-rw-r--r--ftparchive/multicompress.cc3
-rw-r--r--methods/copy.cc14
-rw-r--r--methods/ftp.cc18
-rw-r--r--methods/gzip.cc22
-rw-r--r--methods/https.cc6
-rw-r--r--methods/rred.cc9
-rw-r--r--methods/rsh.cc18
-rw-r--r--methods/server.cc12
-rw-r--r--po/ar.po199
-rw-r--r--po/ast.po208
-rw-r--r--po/bg.po208
-rw-r--r--po/bs.po201
-rw-r--r--po/ca.po208
-rw-r--r--po/cs.po208
-rw-r--r--po/cy.po201
-rw-r--r--po/da.po208
-rw-r--r--po/de.po208
-rw-r--r--po/dz.po210
-rw-r--r--po/el.po208
-rw-r--r--po/es.po208
-rw-r--r--po/eu.po208
-rw-r--r--po/fi.po208
-rw-r--r--po/fr.po208
-rw-r--r--po/gl.po208
-rw-r--r--po/hu.po208
-rw-r--r--po/it.po208
-rw-r--r--po/ja.po208
-rw-r--r--po/km.po210
-rw-r--r--po/ko.po208
-rw-r--r--po/ku.po195
-rw-r--r--po/lt.po199
-rw-r--r--po/mr.po208
-rw-r--r--po/nb.po208
-rw-r--r--po/ne.po210
-rw-r--r--po/nl.po208
-rw-r--r--po/nn.po210
-rw-r--r--po/pl.po208
-rw-r--r--po/pt.po208
-rw-r--r--po/pt_BR.po208
-rw-r--r--po/ro.po208
-rw-r--r--po/ru.po208
-rw-r--r--po/sk.po208
-rw-r--r--po/sl.po208
-rw-r--r--po/sv.po208
-rw-r--r--po/th.po208
-rw-r--r--po/tl.po210
-rw-r--r--po/tr.po208
-rw-r--r--po/uk.po208
-rw-r--r--po/vi.po300
-rw-r--r--po/zh_CN.po208
-rw-r--r--po/zh_TW.po208
-rwxr-xr-xtest/integration/test-apt-cli-upgrade6
-rwxr-xr-xtest/integration/test-apt-get-autoremove10
-rwxr-xr-xtest/integration/test-apt-get-download14
-rwxr-xr-xtest/integration/test-architecture-specification-parsing82
-rwxr-xr-xtest/integration/test-pdiff-usage28
-rwxr-xr-xtest/integration/test-very-tight-loop-configure-with-unpacking-new-packages29
84 files changed, 4826 insertions, 4827 deletions
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index b62bdcae1..e06c30a57 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -19,6 +19,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/time.h>
#include <errno.h>
#include <unistd.h>
#include <apti18n.h>
@@ -95,11 +96,11 @@ bool pkgDirStream::FinishedFile(Item &Itm,int Fd)
/* Set the modification times. The only way it can fail is if someone
has futzed with our file, which is intolerable :> */
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = times[1].tv_sec = Itm.MTime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- if (futimens(Fd, times) != 0)
- _error->Errno("futimens", "Failed to set modification time for %s",Itm.Name);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ if (utimes(Itm.Name, times) != 0)
+ _error->Errno("utimes", "Failed to set modification time for %s",Itm.Name);
if (close(Fd) != 0)
return _error->Errno("close",_("Failed to close file %s"),Itm.Name);
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1185908f3..60003c023 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -757,6 +757,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size,string Md5Has
{
// remove the just applied patch
available_patches.erase(available_patches.begin());
+ unlink((FinalFile + ".ed").c_str());
// move into place
if(Debug)
@@ -887,6 +888,14 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,string M
// otherwise lists cleanup will eat the file
DestFile = FinalFile;
+ // ensure the ed's are gone regardless of list-cleanup
+ for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
+ I != allPatches->end(); ++I)
+ {
+ std::string patch = FinalFile + ".ed." + (*I)->patch.file + ".gz";
+ unlink(patch.c_str());
+ }
+
// all set and done
Complete = true;
if(Debug)
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index a5668a50a..3ae1e8b1d 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -561,45 +561,65 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
return true;
}
/*}}}*/
-bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/
+bool pkgCdrom::MountAndIdentCDROM(Configuration &Database, std::string &CDROM, std::string &ident, pkgCdromStatus * const log)/*{{{*/
{
- stringstream msg;
-
// Startup
- string CDROM = _config->FindDir("Acquire::cdrom::mount");
+ CDROM = _config->FindDir("Acquire::cdrom::mount");
if (CDROM[0] == '.')
CDROM= SafeGetCWD() + '/' + CDROM;
if (log != NULL)
{
- msg.str("");
- ioprintf(msg, _("Using CD-ROM mount point %s\nMounting CD-ROM\n"),
- CDROM.c_str());
- log->Update(msg.str());
+ string msg;
+ log->SetTotal(STEP_LAST);
+ strprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str());
+ log->Update(msg, STEP_PREPARE);
+ }
+
+ // Unmount the CD and get the user to put in the one they want
+ if (_config->FindB("APT::CDROM::NoMount", false) == false)
+ {
+ if(log != NULL)
+ log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT);
+ UnmountCdrom(CDROM);
+
+ if(log != NULL)
+ {
+ log->Update(_("Waiting for disc...\n"), STEP_WAIT);
+ if(!log->ChangeCdrom()) {
+ // user aborted
+ return false;
+ }
+ }
+
+ // Mount the new CDROM
+ if(log != NULL)
+ log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT);
+
+ if (MountCdrom(CDROM) == false)
+ return _error->Error("Failed to mount the cdrom.");
}
- if (MountCdrom(CDROM) == false)
- return _error->Error("Failed to mount the cdrom.");
// Hash the CD to get an ID
if (log != NULL)
- log->Update(_("Identifying.. "));
-
+ log->Update(_("Identifying.. "), STEP_IDENT);
if (IdentCdrom(CDROM,ident) == false)
{
ident = "";
+ if (log != NULL)
+ log->Update("\n");
return false;
}
if (log != NULL)
{
- msg.str("");
- ioprintf(msg, "[%s]\n",ident.c_str());
- log->Update(msg.str());
+ string msg;
+ strprintf(msg, "[%s]\n", ident.c_str());
+ log->Update(msg);
}
// Read the database
- Configuration Database;
string DFile = _config->FindFile("Dir::State::cdroms");
if (FileExists(DFile) == true)
{
@@ -607,12 +627,22 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/
return _error->Error("Unable to read the cdrom database %s",
DFile.c_str());
}
+ return true;
+}
+ /*}}}*/
+bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/
+{
+ Configuration Database;
+ std::string CDROM;
+ if (MountAndIdentCDROM(Database, CDROM, ident, log) == false)
+ return false;
+
if (log != NULL)
{
- msg.str("");
- ioprintf(msg, _("Stored label: %s\n"),
- Database.Find("CD::"+ident).c_str());
- log->Update(msg.str());
+ string msg;
+ strprintf(msg, _("Stored label: %s\n"),
+ Database.Find("CD::"+ident).c_str());
+ log->Update(msg);
}
// Unmount and finish
@@ -628,70 +658,13 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/
/*}}}*/
bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
{
- stringstream msg;
-
- // Startup
- string CDROM = _config->FindDir("Acquire::cdrom::mount");
- if (CDROM[0] == '.')
- CDROM= SafeGetCWD() + '/' + CDROM;
-
- if(log != NULL)
- {
- log->SetTotal(STEP_LAST);
- msg.str("");
- ioprintf(msg, _("Using CD-ROM mount point %s\n"), CDROM.c_str());
- log->Update(msg.str(), STEP_PREPARE);
- }
-
- // Read the database
Configuration Database;
- string DFile = _config->FindFile("Dir::State::cdroms");
- if (FileExists(DFile) == true)
- {
- if (ReadConfigFile(Database,DFile) == false)
- return _error->Error("Unable to read the cdrom database %s",
- DFile.c_str());
- }
-
- // Unmount the CD and get the user to put in the one they want
- if (_config->FindB("APT::CDROM::NoMount",false) == false)
- {
- if(log != NULL)
- log->Update(_("Unmounting CD-ROM\n"), STEP_UNMOUNT);
- UnmountCdrom(CDROM);
-
- if(log != NULL)
- {
- log->Update(_("Waiting for disc...\n"), STEP_WAIT);
- if(!log->ChangeCdrom()) {
- // user aborted
- return false;
- }
- }
-
- // Mount the new CDROM
- if(log != NULL)
- log->Update(_("Mounting CD-ROM...\n"), STEP_MOUNT);
-
- if (MountCdrom(CDROM) == false)
- return _error->Error("Failed to mount the cdrom.");
- }
-
- // Hash the CD to get an ID
- if(log != NULL)
- log->Update(_("Identifying.. "), STEP_IDENT);
- string ID;
- if (IdentCdrom(CDROM,ID) == false)
- {
- if (log != NULL)
- log->Update("\n");
+ std::string ID, CDROM;
+ if (MountAndIdentCDROM(Database, CDROM, ID, log) == false)
return false;
- }
+
if(log != NULL)
- {
- log->Update("["+ID+"]\n");
log->Update(_("Scanning disc for index files..\n"),STEP_SCAN);
- }
// Get the CD structure
vector<string> List;
@@ -740,12 +713,12 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
if (_config->FindB("APT::CDROM::DropTranslation", true) == true)
DropTranslation(TransList);
if(log != NULL) {
- msg.str("");
- ioprintf(msg, _("Found %zu package indexes, %zu source indexes, "
+ string msg;
+ strprintf(msg, _("Found %zu package indexes, %zu source indexes, "
"%zu translation indexes and %zu signatures\n"),
List.size(), SourceList.size(), TransList.size(),
SigList.size());
- log->Update(msg.str(), STEP_SCAN);
+ log->Update(msg, STEP_SCAN);
}
if (List.empty() == true && SourceList.empty() == true)
@@ -778,9 +751,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
if(log != NULL)
{
- msg.str("");
- ioprintf(msg, _("Found label '%s'\n"), Name.c_str());
- log->Update(msg.str());
+ string msg;
+ strprintf(msg, _("Found label '%s'\n"), Name.c_str());
+ log->Update(msg);
}
Database.Set("CD::" + ID + "::Label",Name);
}
@@ -824,9 +797,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
Database.Set("CD::" + ID,Name);
if(log != NULL)
{
- msg.str("");
- ioprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str());
- log->Update(msg.str());
+ string msg;
+ strprintf(msg, _("This disc is called: \n'%s'\n"), Name.c_str());
+ log->Update(msg);
log->Update(_("Copying package lists..."), STEP_COPY);
}
@@ -884,7 +857,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
if(log != NULL)
{
- msg.str("");
+ stringstream msg;
msg << "deb cdrom:[" << Name << "]/" << string(*I,0,Space) <<
" " << string(*I,Space+1) << endl;
log->Update(msg.str());
@@ -902,7 +875,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
}
if(log != NULL) {
- msg.str("");
+ stringstream msg;
msg << "deb-src cdrom:[" << Name << "]/" << string(*I,0,Space) <<
" " << string(*I,Space+1) << endl;
log->Update(msg.str());
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 7d19eb813..db637b96d 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -69,6 +69,10 @@ class pkgCdrom /*{{{*/
public:
bool Ident(std::string &ident, pkgCdromStatus *log);
bool Add(pkgCdromStatus *log);
+
+ private:
+ bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
+ std::string &ident, pkgCdromStatus * const log);
};
/*}}}*/
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 37155b688..71ac9c73f 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1594,11 +1594,17 @@ unsigned long long FileFd::Tell()
unsigned long long FileFd::FileSize()
{
struct stat Buf;
- if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0)
- return FileFdErrno("fstat","Unable to determine the file size");
+
+ bool ispipe = (d != NULL && d->pipe == true);
+ if (ispipe == false)
+ {
+ if (fstat(iFd,&Buf) != 0)
+ return FileFdErrno("fstat","Unable to determine the file size");
+ ispipe = S_ISFIFO(Buf.st_mode);
+ }
// for compressor pipes st_size is undefined and at 'best' zero
- if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode))
+ if (ispipe == true)
{
// we set it here, too, as we get the info here for free
// in theory the Open-methods should take care of it already
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index a2e58fae2..5d21b3847 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -93,7 +93,7 @@ bool pkgInitConfig(Configuration &Cnf)
// Read an alternate config file
const char *Cfg = getenv("APT_CONFIG");
- if (Cfg != 0)
+ if (Cfg != 0 && strlen(Cfg) != 0)
{
if (RealFileExists(Cfg) == true)
Res &= ReadConfigFile(Cnf,Cfg);
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 2ae112af4..420ca14d5 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -30,6 +30,9 @@ unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */
bool InitOutput() /*{{{*/
{
+ if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
+ _config->Set("quiet","1");
+
c0out.rdbuf(cout.rdbuf());
c1out.rdbuf(cout.rdbuf());
c2out.rdbuf(cout.rdbuf());
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 17a60ddcb..20c6e8892 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -111,10 +111,12 @@ OpProgress* pkgCdromTextStatus::GetOpProgress()
};
/*}}}*/
// SetupAutoDetect /*{{{*/
-bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
+bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i, bool &automounted)
{
bool Debug = _config->FindB("Debug::Acquire::cdrom", false);
+ automounted = false;
+
vector<struct CdromDevice> v = UdevCdroms.Scan();
if (i >= v.size())
return false;
@@ -137,6 +139,8 @@ bool AutoDetectCdrom(pkgUdevCdromDevices &UdevCdroms, unsigned int &i)
mkdir(AptMountPoint.c_str(), 0750);
if(MountCdrom(AptMountPoint, v[i].DeviceName) == false)
_error->Warning(_("Failed to mount '%s' to '%s'"), v[i].DeviceName.c_str(), AptMountPoint.c_str());
+ else
+ automounted = true;
_config->Set("Acquire::cdrom::mount", AptMountPoint);
_config->Set("APT::CDROM::NoMount", true);
}
@@ -160,17 +164,35 @@ bool DoAdd(CommandLine &)
bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
unsigned int count = 0;
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+ bool automounted = false;
if (AutoDetect && UdevCdroms.Dlopen())
- while (AutoDetectCdrom(UdevCdroms, count))
- res &= cdrom.Add(&log);
- if (count == 0) {
- res = cdrom.Add(&log);
- if (res == false) {
- _error->Error("%s", _(W_NO_CDROM_FOUND));
+ while (AutoDetectCdrom(UdevCdroms, count, automounted)) {
+ if (count == 1) {
+ // begin loop with res false to detect any success using OR
+ res = false;
+ }
+
+ // dump any warnings/errors from autodetect
+ if (_error->empty() == false)
+ _error->DumpErrors();
+
+ res |= cdrom.Add(&log);
+
+ if (automounted)
+ UnmountCdrom(AptMountPoint);
+
+ // dump any warnings/errors from add/unmount
+ if (_error->empty() == false)
+ _error->DumpErrors();
}
- }
- if(res)
+ if (count == 0)
+ res = cdrom.Add(&log);
+
+ if (res == false)
+ _error->Error("%s", _(W_NO_CDROM_FOUND));
+ else
cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
return res;
@@ -187,18 +209,38 @@ bool DoIdent(CommandLine &)
pkgCdrom cdrom;
bool res = true;
- bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect");
+ bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true);
unsigned int count = 0;
+ string AptMountPoint = _config->FindDir("Dir::Media::MountPath");
+ bool automounted = false;
if (AutoDetect && UdevCdroms.Dlopen())
- while (AutoDetectCdrom(UdevCdroms, count))
- res &= cdrom.Ident(ident, &log);
- if (count == 0) {
- res = cdrom.Ident(ident, &log);
- if (res == false) {
- _error->Error("%s", _(W_NO_CDROM_FOUND));
+ while (AutoDetectCdrom(UdevCdroms, count, automounted)) {
+ if (count == 1) {
+ // begin loop with res false to detect any success using OR
+ res = false;
+ }
+
+ // dump any warnings/errors from autodetect
+ if (_error->empty() == false)
+ _error->DumpErrors();
+
+ res |= cdrom.Ident(ident, &log);
+
+ if (automounted)
+ UnmountCdrom(AptMountPoint);
+
+ // dump any warnings/errors from add/unmount
+ if (_error->empty() == false)
+ _error->DumpErrors();
}
- }
+
+ if (count == 0)
+ res = cdrom.Ident(ident, &log);
+
+ if (res == false)
+ _error->Error("%s", _(W_NO_CDROM_FOUND));
+
return res;
}
/*}}}*/
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 9fae8d55c..c956f557a 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -630,8 +630,8 @@ bool DoDownload(CommandLine &CmdL)
return false;
APT::CacheSetHelper helper(c0out);
- APT::VersionList verset = APT::VersionList::FromCommandLine(Cache,
- CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper);
+ APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache,
+ CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper);
if (verset.empty() == true)
return false;
@@ -650,7 +650,7 @@ bool DoDownload(CommandLine &CmdL)
std::string const cwd = SafeGetCWD();
_config->Set("Dir::Cache::Archives", cwd);
int i = 0;
- for (APT::VersionList::const_iterator Ver = verset.begin();
+ for (APT::VersionSet::const_iterator Ver = verset.begin();
Ver != verset.end(); ++Ver, ++i)
{
pkgAcquire::Item *I = new pkgAcqArchive(&Fetcher, SrcList, &Recs, *Ver, storefile[i]);
@@ -1739,10 +1739,6 @@ int main(int argc,const char *argv[]) /*{{{*/
// see if we are in simulate mode
CheckSimulateMode(CmdL);
- // Deal with stdout not being a tty
- if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
- _config->Set("quiet","1");
-
// Setup the output streams
InitOutput();
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 6fe25e3f3..6ad470faa 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -156,8 +156,6 @@ int main(int argc, const char *argv[]) /*{{{*/
<< std::endl
<< std::endl;
}
- if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
- _config->Set("quiet","1");
// See if the help should be shown
if (_config->FindB("help") == true ||
diff --git a/configure.ac b/configure.ac
index ee8b7ab25..4fa54b442 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.15.1ubuntu1"
+PACKAGE_VERSION="0.9.15.2ubuntu1"
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 7196d760c..446f2295a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+apt (0.9.15.2) unstable; urgency=medium
+
+ [ Michael Vogt ]
+ * move isatty() check into InitOutput()
+ * Use a APT::VersionSet instead of a VersionList
+ (closes: #738103)
+
+ [ David Kalnischkies ]
+ * simplify code to make compilers happy
+ * update libapt-pkg.symbols file
+ * bump Standards-Version to 3.9.5 (no changes needed)
+ * do not use an empty APT_CONFIG environment variable
+ * always cleanup patchfiles at the end of rred call
+ * use VersionSet in download to handle repeats (Closes: 738103)
+ * use utimes instead of utimensat/futimens (Closes: 738567)
+
+ [ John Ogness ]
+ * apt-cdrom should succeed if any drive succeeds (Closes: 728153)
+
+ [ Trần Ngá»c Quân ]
+ * l10n: vi.po (621t): Update and review
+
+ -- Michael Vogt <mvo@debian.org> Thu, 13 Feb 2014 09:50:04 +0100
+
apt (0.9.15.1ubuntu1) trusty; urgency=low
* merged from debian/sid
diff --git a/debian/control b/debian/control
index 527a8d65f..b9a468479 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Michael Vogt <mvo@debian.org>, Christian Perrier <bubulle@debian.org>,
Julian Andres Klode <jak@debian.org>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml,
diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.12.symbols
index af43a7b07..3236d227a 100644
--- a/debian/libapt-pkg4.12.symbols
+++ b/debian/libapt-pkg4.12.symbols
@@ -1459,7 +1459,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER#
(c++)"APT::Progress::PackageManagerFancy::~PackageManagerFancy()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerFancy::PackageManagerFancy()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerFancy::SetupTerminalScrollArea(int)@Base" 0.9.13~exp1
- (c++)"APT::Progress::PackageManagerFancy::Start()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerFancy::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerFancy::Stop()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::fork()@Base" 0.9.13~exp1
@@ -1483,7 +1482,6 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER#
(c++)"APT::Progress::PackageManagerProgressFd::Stop()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManagerProgressFd::WriteToStatusFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::Pulse()@Base" 0.9.13~exp1
- (c++)"APT::Progress::PackageManager::Start()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::StartDpkg()@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::StatusChanged(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned int, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13~exp1
(c++)"APT::Progress::PackageManager::Stop()@Base" 0.9.13~exp1
@@ -1512,6 +1510,23 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER#
(c++)"vtable for APT::Progress::PackageManagerProgressDeb822Fd@Base" 0.9.13~exp1
(c++)"vtable for APT::Progress::PackageManagerProgressFd@Base" 0.9.13~exp1
(c++)"vtable for APT::Progress::PackageManagerText@Base" 0.9.13~exp1
+ (c++)"APT::Progress::PackageManagerFancy::instances@Base" 0.9.14.2
+ (c++)"APT::Progress::PackageManagerFancy::Start(int)@Base" 0.9.14.2
+ (c++)"APT::Progress::PackageManagerFancy::staticSIGWINCH(int)@Base" 0.9.14.2
+ (c++)"APT::Progress::PackageManager::Start(int)@Base" 0.9.14.2
+### client-side merged pdiffs
+ (c++)"pkgAcqIndexMergeDiffs::DescURI()@Base" 0.9.14.3~exp1
+ (c++)"pkgAcqIndexMergeDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.9.14.3~exp1
+ (c++)"pkgAcqIndexMergeDiffs::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.9.14.3~exp1
+ (c++)"pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs()@Base" 0.9.14.3~exp1
+ (c++)"pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashString const&, DiffInfo const&, std::vector<pkgAcqIndexMergeDiffs*, std::allocator<pkgAcqIndexMergeDiffs*> > const*)@Base" 0.9.14.3~exp1
+ (c++)"typeinfo for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1
+ (c++)"typeinfo name for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1
+ (c++)"vtable for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1
+### deb822 sources.list format
+ (c++)"pkgSourceList::ParseFileDeb822(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1
+ (c++)"pkgSourceList::ParseFileOldStyle(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1
+ (c++)"pkgSourceList::Type::ParseStanza(std::vector<metaIndex*, std::allocator<metaIndex*> >&, pkgTagSection&, int, FileFd&)@Base" 0.9.14.3~exp1
### mixed stuff
(c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp13
(c++)"pkgCache::DepIterator::IsIgnorable(pkgCache::PkgIterator const&) const@Base" 0.8.16~exp10
@@ -1570,6 +1585,8 @@ libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER#
(c++)"HashString::FromFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.13.1
(c++)"HashString::GetHashForFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.9.13.1
(c++)"indexRecords::GetSuite() const@Base" 0.9.13.2
+ (c++)"GetTempDir()@Base" 0.9.14.2
+ (c++|optional=private)"pkgCdrom::MountAndIdentCDROM(Configuration&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, pkgCdromStatus*)@Base" 0.9.15.2
### demangle strangeness - buildd report it as MISSING and as new…
(c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0
### gcc artefacts
diff --git a/debian/tests/control b/debian/tests/control
index e38921c7e..ae794f762 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,3 @@
Tests: run-tests
-Depends: @, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4 \ No newline at end of file
+Restrictions: allow-stderr
+Depends: @, apt, dpkg-dev, debhelper, libdb-dev, gettext, libcurl4-gnutls-dev, zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a, autotools-dev, autoconf, automake, doxygen, debiandoc-sgml, stunnel4
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 233c5a386..d9a9db7bf 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -2,12 +2,9 @@
set -e
-# 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
+ make startup
fi
make -C test/interactive-helper/
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 9ebbd9673..306bab1dc 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -613,7 +613,7 @@ WARNINGS = YES
# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
# automatically be disabled.
-WARN_IF_UNDOCUMENTED = YES
+WARN_IF_UNDOCUMENTED = NO
# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
# potential errors in the documentation, such as not documenting some
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index a96c84d3a..cadcc27ae 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,7 +219,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.15.1">
+<!ENTITY apt-product-version "0.9.15.2">
<!-- (Code)names for various things used all over the place -->
<!ENTITY oldstable-codename "squeeze">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 36aa51ff9..d0973638a 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.15.1\n"
+"Project-Id-Version: apt-doc 0.9.15.2\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -6186,7 +6186,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 6914f6fdc..69f018966 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"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: 2014-02-06 18:22+0100\n"
+"POT-Creation-Date: 2014-02-13 09:53+0100\n"
"PO-Revision-Date: 2014-01-26 15:26+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -8750,7 +8750,7 @@ msgstr ""
#| "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 6e277b452..213c704b1 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: 2014-02-06 18:22+0100\n"
+"POT-Creation-Date: 2014-02-13 09:53+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"
@@ -8762,7 +8762,7 @@ msgstr ""
#| "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 11d4bfeb7..0a240192a 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: 2014-02-06 18:22+0100\n"
+"POT-Creation-Date: 2014-02-13 09:53+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"
@@ -8723,7 +8723,7 @@ msgstr ""
#| "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 97fa23697..23d39d156 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: 2014-02-06 18:22+0100\n"
+"POT-Creation-Date: 2014-02-13 09:53+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"
@@ -8736,7 +8736,7 @@ msgstr ""
#| "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 57dad234e..3b78ee69b 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: 2014-02-06 18:22+0100\n"
+"POT-Creation-Date: 2014-02-13 09:53+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"
@@ -8306,7 +8306,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 b0311d96f..99c07d3ff 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: 2014-02-06 18:22+0100\n"
+"POT-Creation-Date: 2014-02-13 09:53+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"
@@ -7966,7 +7966,7 @@ msgstr ""
#| "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 24d74f0e5..3092cd08d 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: 2014-02-06 18:22+0100\n"
+"POT-Creation-Date: 2014-02-13 09:53+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"
@@ -8670,7 +8670,7 @@ msgstr ""
#| "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 4c6f1bb5b..8bc4e768d 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: 2014-02-06 18:22+0100\n"
+"POT-Creation-Date: 2014-02-13 09:53+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"
@@ -6601,7 +6601,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/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index c1bd6037a..1555d2f2d 100644
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -24,6 +24,7 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/time.h>
#include <unistd.h>
#include <iostream>
@@ -237,7 +238,7 @@ bool MultiCompress::Finalize(unsigned long long &OutSize)
if (UpdateMTime > 0 &&
(Now - St.st_mtime > (signed)UpdateMTime || St.st_mtime > Now))
{
- utimensat(AT_FDCWD, I->Output.c_str(), NULL, AT_SYMLINK_NOFOLLOW);
+ utimes(I->Output.c_str(), NULL);
Changed = true;
}
}
diff --git a/methods/copy.cc b/methods/copy.cc
index 744cc2b51..f2a8f9ed8 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -18,6 +18,7 @@
#include <apt-pkg/hashes.h>
#include <sys/stat.h>
+#include <sys/time.h>
#include <unistd.h>
#include <apti18n.h>
/*}}}*/
@@ -70,18 +71,15 @@ bool CopyMethod::Fetch(FetchItem *Itm)
}
From.Close();
+ To.Close();
// Transfer the modification times
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = Buf.st_atime;
times[1].tv_sec = Buf.st_mtime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- if (futimens(To.Fd(), times) != 0)
- {
- To.OpFail();
- return _error->Errno("futimens",_("Failed to set modification time"));
- }
- To.Close();
+ times[0].tv_usec = times[1].tv_usec = 0;
+ if (utimes(Res.Filename.c_str(), times) != 0)
+ return _error->Errno("utimes",_("Failed to set modification time"));
Hashes Hash;
FileFd Fd(Res.Filename, FileFd::ReadOnly);
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 2d05364d5..70bf4f607 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -954,11 +954,11 @@ void FtpMethod::SigTerm(int)
_exit(100);
// Timestamp
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = FailTime;
times[1].tv_sec = FailTime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- futimens(FailFd, times);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ utimes(FailFile.c_str(), times);
close(FailFd);
@@ -1062,11 +1062,11 @@ bool FtpMethod::Fetch(FetchItem *Itm)
Fd.Close();
// Timestamp
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = FailTime;
times[1].tv_sec = FailTime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- futimens(FailFd, times);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ utimes(FailFile.c_str(), times);
// If the file is missing we hard fail and delete the destfile
// otherwise transient fail
@@ -1081,11 +1081,11 @@ bool FtpMethod::Fetch(FetchItem *Itm)
Res.Size = Fd.Size();
// Timestamp
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = FailTime;
times[1].tv_sec = FailTime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- futimens(Fd.Fd(), times);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ utimes(Fd.Name().c_str(), times);
FailFd = -1;
}
diff --git a/methods/gzip.cc b/methods/gzip.cc
index f1edb353b..a2844e969 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -18,6 +18,7 @@
#include <apt-pkg/hashes.h>
#include <sys/stat.h>
+#include <sys/time.h>
#include <unistd.h>
#include <stdio.h>
#include <errno.h>
@@ -93,6 +94,8 @@ bool GzipMethod::Fetch(FetchItem *Itm)
}
From.Close();
+ Res.Size = To.FileSize();
+ To.Close();
if (Failed == true)
return false;
@@ -102,23 +105,14 @@ bool GzipMethod::Fetch(FetchItem *Itm)
if (stat(Path.c_str(),&Buf) != 0)
return _error->Errno("stat",_("Failed to stat"));
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = Buf.st_atime;
- times[1].tv_sec = Buf.st_mtime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- if (futimens(To.Fd(), times) != 0)
- {
- To.OpFail();
- return _error->Errno("futimens",_("Failed to set modification time"));
- }
- Res.Size = To.FileSize();
- To.Close();
-
- if (stat(Itm->DestFile.c_str(),&Buf) != 0)
- return _error->Errno("stat",_("Failed to stat"));
+ Res.LastModified = times[1].tv_sec = Buf.st_mtime;
+ times[0].tv_usec = times[1].tv_usec = 0;
+ if (utimes(Itm->DestFile.c_str(), times) != 0)
+ return _error->Errno("utimes",_("Failed to set modification time"));
// Return a Done response
- Res.LastModified = Buf.st_mtime;
Res.TakeHashes(Hash);
URIDone(Res);
diff --git a/methods/https.cc b/methods/https.cc
index e16e36339..146b2bfb8 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -404,11 +404,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_getinfo(curl, CURLINFO_FILETIME, &Res.LastModified);
if (Res.LastModified != -1)
{
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = Res.LastModified;
times[1].tv_sec = Res.LastModified;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- futimens(File->Fd(), times);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ utimes(File->Name().c_str(), times);
}
else
Res.LastModified = resultStat.st_mtime;
diff --git a/methods/rred.cc b/methods/rred.cc
index f7dac3c19..fe7ef7322 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#include <sys/time.h>
#include <apti18n.h>
@@ -597,12 +598,12 @@ class RredMethod : public pkgAcqMethod {
stat(patch_name.c_str(), &bufpatch) != 0)
return _error->Errno("stat", _("Failed to stat"));
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = bufbase.st_atime;
times[1].tv_sec = bufpatch.st_mtime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- if (utimensat(AT_FDCWD, Itm->DestFile.c_str(), times, 0) != 0)
- return _error->Errno("utimensat",_("Failed to set modification time"));
+ times[0].tv_usec = times[1].tv_usec = 0;
+ if (utimes(Itm->DestFile.c_str(), times) != 0)
+ return _error->Errno("utimes",_("Failed to set modification time"));
if (stat(Itm->DestFile.c_str(), &bufbase) != 0)
return _error->Errno("stat", _("Failed to stat"));
diff --git a/methods/rsh.cc b/methods/rsh.cc
index a441220bf..4e1aaea26 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -396,11 +396,11 @@ void RSHMethod::SigTerm(int sig)
_exit(100);
// Transfer the modification times
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = FailTime;
times[1].tv_sec = FailTime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- futimens(FailFd, times);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ utimes(FailFile.c_str(), times);
close(FailFd);
_exit(100);
@@ -488,11 +488,11 @@ bool RSHMethod::Fetch(FetchItem *Itm)
Fd.Close();
// Timestamp
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = FailTime;
times[1].tv_sec = FailTime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- futimens(FailFd, times);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ utimes(FailFile.c_str(), times);
// If the file is missing we hard fail otherwise transient fail
if (Missing == true)
@@ -502,11 +502,11 @@ bool RSHMethod::Fetch(FetchItem *Itm)
}
Res.Size = Fd.Size();
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = FailTime;
times[1].tv_sec = FailTime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- futimens(Fd.Fd(), times);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ utimes(Fd.Name().c_str(), times);
FailFd = -1;
}
diff --git a/methods/server.cc b/methods/server.cc
index e12c23c07..76faa7e7f 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -369,11 +369,11 @@ void ServerMethod::SigTerm(int)
if (FailFd == -1)
_exit(100);
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = FailTime;
times[1].tv_sec = FailTime;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- futimens(FailFd, times);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ utimes(FailFile.c_str(), times);
close(FailFd);
_exit(100);
@@ -539,10 +539,10 @@ int ServerMethod::Loop()
File = 0;
// Timestamp
- struct timespec times[2];
+ struct timeval times[2];
times[0].tv_sec = times[1].tv_sec = Server->Date;
- times[0].tv_nsec = times[1].tv_nsec = 0;
- utimensat(AT_FDCWD, Queue->DestFile.c_str(), times, AT_SYMLINK_NOFOLLOW);
+ times[0].tv_usec = times[1].tv_usec = 0;
+ utimes(Queue->DestFile.c_str(), times);
// Send status to APT
if (Result == true)
diff --git a/po/ar.po b/po/ar.po
index a524dc0e2..12f2a2a4e 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -160,7 +160,7 @@ msgstr ""
msgid " Version table:"
msgstr " جدول النسخ:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -222,12 +222,12 @@ msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.
msgid "Please insert a Disc in the drive and press enter"
msgstr "الرجاء إدخال قرص ÙÙŠ السواقة وضغط الزر enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Ùشل تغيير اسم %s إلى %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "كرر هذه العملية لباقي الأقراص المدمجة ÙÙŠ المجموعة."
@@ -643,12 +643,12 @@ msgstr "لم ÙŠÙعثر على القرص."
msgid "File not found"
msgstr "لم ÙŠÙعثر على الملÙ"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Ùشيل تنÙيذ stat"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Ùشل تعيين وقت التعديل"
@@ -907,7 +907,7 @@ msgid ""
"available:\n"
msgstr ""
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1212,108 +1212,108 @@ msgstr "تثبيت هذه الحزم دون التحقق منها؟"
msgid "Failed to fetch %s %s\n"
msgstr "Ùشل إحضار %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Ù…Ùثبّتة]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Ù…Ùثبّتة]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Ù…Ùثبّتة]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Ù…Ùثبّتة]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "إلا أن %s مثبت"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "إلا أنه سيتم تثبيت %s"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "إلا أنه غير قابل للتثبيت"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "إلا أنها حزمة وهمية"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "إلا أنها غير مثبتة"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "إلا أنه لن يتم تثبيتها"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " أو"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "سيتم إزالة الحزم التالية:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "سيتم الإبقاء على الحزم التالية:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "ستتم ترقية الحزم التالية:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "سيتم تثبيط الحزم التالية:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "سيتم تغيير الحزم المبقاة التالية:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (بسبب %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1321,27 +1321,27 @@ msgstr ""
"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
"لا يجب أن تقوم بهذا إلى إن كنت تعر٠تماماً ما تقوم به!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu أعيد تثبيتها، "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu مثبطة، "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
@@ -1350,7 +1350,7 @@ msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1358,21 +1358,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1540,7 +1540,7 @@ msgstr "Ùشل إغلاق المل٠%s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -1843,47 +1843,47 @@ msgstr ""
msgid "Malformed override %s line %llu #3"
msgstr ""
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr ""
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr ""
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr ""
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr ""
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr ""
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "خطأ داخلي، تعذر إنشاء %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr ""
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr ""
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Ùشل تغيير اسم %s إلى %s"
@@ -1997,12 +1997,12 @@ msgstr ""
msgid "Duplicate conf file %s/%s"
msgstr "مل٠تهيئة Ù…Ùزدوج %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Ùشلت كتابة المل٠%s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Ùشل إغلاق المل٠%s"
@@ -2380,22 +2380,22 @@ msgstr ""
msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "مشكلة ÙÙŠ إغلاق الملÙ"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "مشكلة ÙÙŠ مزامنة الملÙ"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "مشكلة ÙÙŠ إغلاق الملÙ"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "مشكلة ÙÙŠ مزامنة الملÙ"
@@ -2644,7 +2644,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
@@ -2814,35 +2814,35 @@ msgstr "الحجم غير متطابق"
msgid "Invalid file format"
msgstr "عمليّة غير صالحة %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "تعذر Ùتح مل٠قاعدة البيانات %s: %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2850,24 +2850,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2903,71 +2903,64 @@ msgstr "تعذر Ùتح مل٠قاعدة البيانات %s: %s"
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:576
+#: apt-pkg/cdrom.cc:575
#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
+msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
+#: apt-pkg/cdrom.cc:583
+msgid "Unmounting CD-ROM\n"
+msgstr "ÙÙƒ تركيب القرص المدمج\n"
+
+#: apt-pkg/cdrom.cc:588
+msgid "Waiting for disc...\n"
+msgstr "بانتظار القرص...\n"
+
+#: apt-pkg/cdrom.cc:597
+msgid "Mounting CD-ROM...\n"
+msgstr "تركيب القرص...\n"
+
+#: apt-pkg/cdrom.cc:605
msgid "Identifying.. "
msgstr "جاري التعرÙ..."
-#: apt-pkg/cdrom.cc:613
+#: apt-pkg/cdrom.cc:643
#, c-format
msgid "Stored label: %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
#, fuzzy
msgid "Unmounting CD-ROM...\n"
msgstr "ÙÙƒ تركيب القرص المدمج..."
-#: apt-pkg/cdrom.cc:642
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:660
-msgid "Unmounting CD-ROM\n"
-msgstr "ÙÙƒ تركيب القرص المدمج\n"
-
-#: apt-pkg/cdrom.cc:665
-msgid "Waiting for disc...\n"
-msgstr "بانتظار القرص...\n"
-
-#: apt-pkg/cdrom.cc:674
-msgid "Mounting CD-ROM...\n"
-msgstr "تركيب القرص...\n"
-
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "هذا الاسم غير صالح، حاول مجدداً.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -2976,15 +2969,15 @@ msgstr ""
"هذا القرص مسمى: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "نسخ قوائم الحزم..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "كتابة لائحة المصادر الجديدة\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 15a485a67..617e576c9 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -153,7 +153,7 @@ msgstr " Chincheta de paquetes: "
msgid " Version table:"
msgstr " Tabla de versiones:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -253,12 +253,12 @@ msgstr "Da-y un nome a esti discu, como 'Debian 5.0.3 Discu 1'"
msgid "Please insert a Disc in the drive and press enter"
msgstr "Inxerta un discu nel preséu y calca intro"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Falló al montar '%s' a '%s'"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repite'l procesu colos demás CDs del conxuntu."
@@ -749,12 +749,12 @@ msgstr "Nun s'atopa'l discu."
msgid "File not found"
msgstr "Nun s'atopa'l ficheru."
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Falló al lleer"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Nun se pudo afitar la hora de modificación"
@@ -1016,7 +1016,7 @@ msgstr ""
"Les robles siguientes nun pudieron verificase porque la to llave pública nun "
"ta a mano:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1334,108 +1334,108 @@ msgstr "¿Instalar esos paquetes ensin verificación?"
msgid "Failed to fetch %s %s\n"
msgstr "Falló algamar %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Instaláu]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Los siguientes paquetes nun cumplen dependencies:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "pero %s ta instaláu"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s ta pa instalar"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "pero nun ye instalable"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "pero ye un paquete virtual"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "pero nun ta instaláu"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "pero nun va instalase"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Van instalase los siguientes paquetes NUEVOS:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes van DESANICIASE:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes tan reteníos:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Los siguientes paquetes van actualizase:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Los siguientes paquetes van DESACTUALIZASE:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Van camudase los siguientes paquetes reteníos:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1443,27 +1443,27 @@ msgstr ""
"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
"¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizaos, %lu nuevos instalaos, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalaos, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizaos, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
@@ -1472,7 +1472,7 @@ msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1480,21 +1480,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación d'espresión regular - %s"
@@ -1667,7 +1667,7 @@ msgstr "Nun s'alcontró ficheru espeyu '%s'"
msgid "[Mirror: %s]"
msgstr "[Espeyu: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falló criar un tubu IPC al soprocesu"
@@ -2025,47 +2025,47 @@ msgstr "Saltu mal formáu %s llinia %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Saltu mal formáu %s llinia %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Algoritmu de compresión desconocíu '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "La salida comprimida %s necesita un xuegu de compresión"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Nun pudo criase FICHERU*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Nun pudo biforcase"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Comprimir fíu"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Error internu, nun pudo criase %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Fallu na ES al soprocesu/ficheru"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Nun pudo lleese al computar MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problema al desenllazar %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Nun pudo renomase %s como %s"
@@ -2202,12 +2202,12 @@ msgstr "Doble suma de desvíu %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Ficheru de configuración duplicáu %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Falló la escritura nel ficheru %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Falló al pesllar el ficheru %s"
@@ -2590,22 +2590,22 @@ msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada"
msgid "write, still have %llu to write but couldn't"
msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problemes zarrando'l ficheru %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Hai problemes al renomar el ficheru %s a %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Hai problemes desvenceyando'l ficheru %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Hai problemes al sincronizar el ficheru"
@@ -2865,7 +2865,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta'l direutoriu de llistes %spartial."
@@ -3037,35 +3037,35 @@ msgstr "El tamañu nun concasa"
msgid "Invalid file format"
msgstr "Operación incorreuta: %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3075,12 +3075,12 @@ msgstr ""
"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Fallu GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3089,12 +3089,12 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3132,50 +3132,41 @@ msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "El bloque de fornidor %s nun contién una buelga dixital"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Usando el puntu de montaxe de CD-ROM %s\n"
-"Montando el CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identificando.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Etiqueta guardada: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Desmontando l CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Usando el puntu de montaxe de CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Desmontando'l CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Esperando'l discu...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Montando'l CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identificando.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Etiqueta guardada: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando l CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Buscando nel discu ficheros d'índices...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3184,7 +3175,7 @@ msgstr ""
"Atopáu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y "
"%zu firmes\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3192,16 +3183,16 @@ msgstr ""
"Nun s'alcuentra dengún paquete de ficheros, seique nun ye un Discu Debian o "
"hai una arquiteutura inválida?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Atopóse la etiqueta: '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Esi nun ye un nome válidu; inténtalo otra vuelta.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3210,15 +3201,15 @@ msgstr ""
"Esti discu llámase: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Copiando les llistes de paquetes..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Escribiendo llista nueva d'oríxenes\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n"
@@ -3527,6 +3518,13 @@ msgid "Not locked"
msgstr "Non bloquiáu"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Usando el puntu de montaxe de CD-ROM %s\n"
+#~ "Montando el CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 860ab7e10..a7745b195 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -159,7 +159,7 @@ msgstr " Отбиване на пакета: "
msgid " Version table:"
msgstr " Таблица Ñ Ð²ÐµÑ€Ñиите:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -254,12 +254,12 @@ msgstr "Укажете име за този диÑк, например „Debian
msgid "Please insert a Disc in the drive and press enter"
msgstr "Сложете диÑк в уÑтройÑтвото и натиÑнете „Enter“"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "ÐеуÑпех при монтиране на %s на %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Повторете този Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð·Ð° оÑтаналите диÑкове от комплекта."
@@ -776,12 +776,12 @@ msgstr "ДиÑкът не е намерен."
msgid "File not found"
msgstr "Файлът не е намерен"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "ÐеуÑпех при получаването на атрибути"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "ÐеуÑпех при задаването на време на промÑна"
@@ -1048,7 +1048,7 @@ msgstr ""
"Следните подпиÑи не можаха да бъдат проверени, защото Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¸Ñ ÐºÐ»ÑŽÑ‡ не е "
"наличен:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Празни файлове не могат да бъдат валидни архиви"
@@ -1368,108 +1368,108 @@ msgstr "ИнÑталиране на тези пакети без проверкÐ
msgid "Failed to fetch %s %s\n"
msgstr "ÐеуÑпех при изтеглÑнето на %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [ИнÑталиран]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [ИнÑталиран]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [ИнÑталиран]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [ИнÑталиран]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Следните пакети имат неудовлетворени завиÑимоÑти:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "но е инÑталиран %s"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "но ще бъде инÑталиран %s"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "но той не може да бъде инÑталиран"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "но той е виртуален пакет"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "но той не е инÑталиран"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "но той нÑма да бъде инÑталиран"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " или"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Следните ÐОВИ пакети ще бъдат инÑталирани:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Следните пакети ще бъдат ПРЕМÐÐ¥ÐÐТИ:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Следните пакети нÑма да бъдат променени:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Следните пакети ще бъдат актуализирани:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Следните пакети ще бъдат ВЪРÐÐТИ КЪМ ПО-СТÐРРВЕРСИЯ:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Следните задържани пакети ще бъдат променени:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (поради %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1477,27 +1477,27 @@ msgstr ""
"ПРЕДУПРЕЖДЕÐИЕ: Следните необходими пакети ще бъдат премахнати.\n"
"Това ÐЕ би Ñ‚Ñ€Ñбвало да Ñтава оÑвен ако знаете точно какво правите!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu актуализирани, %lu нови инÑталирани, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu преинÑталирани, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu върнати към по-Ñтара верÑиÑ, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu за премахване и %lu без промÑна.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu не Ñа напълно инÑталирани или премахнати.\n"
@@ -1506,7 +1506,7 @@ msgstr "%lu не Ñа напълно инÑталирани или премахÐ
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1514,21 +1514,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулÑÑ€Ð½Ð¸Ñ Ð¸Ð·Ñ€Ð°Ð· - %s"
@@ -1702,7 +1702,7 @@ msgstr "Грешка при четене файла „%s“ от огледал
msgid "[Mirror: %s]"
msgstr "[Огледален Ñървър: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "ÐеуÑпех при Ñъздаването на IPC pipe към подпроцеÑа"
@@ -2062,47 +2062,47 @@ msgstr "Ðеправилно форматиран override %s, ред %llu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Ðеправилно форматиран override %s, ред %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Ðепознат алгоритъм за компреÑÐ¸Ñ â€ž%s“"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "КомпреÑираниÑÑ‚ изход %s изиÑква наÑтройка за компреÑирането"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "ÐеуÑпех при Ñъздаването на FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "ÐеуÑпех при пуÑкането на подпроцеÑ"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "ПроцеÑ-потомък за компреÑиране"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Вътрешна грешка, неуÑпех при Ñъздаването на %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Ð’/И към подпроцеÑа/файла пропадна"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "ÐеуÑпех при четене докато Ñе изчиÑлÑва MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "ÐеуÑпех при премахването на връзка на %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "ÐеуÑпех при преименуването на %s на %s"
@@ -2237,12 +2237,12 @@ msgstr "Двойно добавÑне на отклонение %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Дублиран конфигурационен файл %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "ÐеуÑпех при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° файл %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "ÐеуÑпех при затварÑнето на файл %s"
@@ -2630,22 +2630,22 @@ msgstr ""
msgid "write, still have %llu to write but couldn't"
msgstr "грешка при запиÑ, вÑе още име %llu за запиÑ, но не уÑпÑ"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Проблем при затварÑне на файла %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Проблем при преименуване на файла %s на %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Проблем при изтриване на файла %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Проблем при Ñинхронизиране на файла"
@@ -2911,7 +2911,7 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"ÐеуÑпех при коригирането на проблемите, имате задържани Ñчупени пакети."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "ДиректориÑта ÑÑŠÑ ÑпиÑъци %spartial липÑва."
@@ -3090,7 +3090,7 @@ msgstr "ÐеÑъответÑтвие на размера"
msgid "Invalid file format"
msgstr "Ðевалидна Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3099,16 +3099,16 @@ msgstr ""
"Ðе може да Ñе открие елемент „%s“ във файла Release (объркан ред в sources."
"list или повреден файл)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ðе е открита контролна Ñума за „%s“ във файла Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "ÐÑма налични публични ключове за Ñледните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3117,12 +3117,12 @@ msgstr ""
"Файлът ÑÑŠÑ Ñлужебна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° „%s“ е оÑтарÑл (валиден до %s). ÐÑма да Ñе "
"прилагат обновÑÐ²Ð°Ð½Ð¸Ñ Ð¾Ñ‚ това хранилище."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт в диÑтрибуциÑта: %s (очаквана: %s, намерена: %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3132,12 +3132,12 @@ msgstr ""
"използват Ñтарите индекÑни файлове. Грешка от GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Грешка от GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3146,12 +3146,12 @@ msgstr ""
"ÐеуÑпех при намирането на файл за пакет %s. Това може да означава, че Ñ‚Ñ€Ñбва "
"ръчно да оправите този пакет (поради пропуÑната архитектура)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Ðе е открит източник, от който да Ñе изтегли верÑÐ¸Ñ â€ž%s“ на „%s“"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3188,50 +3188,41 @@ msgstr "Ðеправилна ÑтойноÑÑ‚ за „Date“ във файÐ
msgid "Vendor block %s contains no fingerprint"
msgstr "Блокът на Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»Ñ %s не Ñъдържа отпечатък"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Използване на точка за монтиране на CD-ROM %s\n"
-"Монтиране на CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Идентифициране..."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Запазен етикет: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Демонтиране на CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Използване на точка за монтиране на CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Демонтиране на CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Чакане за диÑк...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Монтиране на CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Идентифициране..."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Запазен етикет: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Демонтиране на CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Сканиране на диÑка за индекÑни файлове...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3240,7 +3231,7 @@ msgstr ""
"Ðамерени Ñа %zu индекÑа на пакети, %zu индекÑа на пакети Ñ Ð¸Ð·Ñ…Ð¾Ð´ÐµÐ½ код, %zu "
"индекÑа Ñ Ð¿Ñ€ÐµÐ²Ð¾Ð´Ð¸ и %zu подпиÑа.\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3248,16 +3239,16 @@ msgstr ""
"Ðе Ñа намерени файлове Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸. Мое би диÑкът не е Ñ Ð”ÐµÐ±Ð¸Ð°Ð½ или е за "
"погрешна компютърна архитектура."
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Ðамерен е етикет „%s“\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Това не е валидно име, опитайте отново.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3266,15 +3257,15 @@ msgstr ""
"Ðаименование на този диÑк: \n"
"„%s“\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Копиране на ÑпиÑъците Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Запазване на Ð½Ð¾Ð²Ð¸Ñ ÑпиÑък Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "ЗапиÑите в ÑпиÑъка Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ñ†Ð¸ за този диÑк Ñа:\n"
@@ -3585,6 +3576,13 @@ msgid "Not locked"
msgstr "Без заключване"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Използване на точка за монтиране на CD-ROM %s\n"
+#~ "Монтиране на CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 85e507b3a..32164cd30 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -155,7 +155,7 @@ msgstr ""
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -216,12 +216,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Ne mogu otvoriti %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -649,12 +649,12 @@ msgstr "Datoteka nije pronađena"
msgid "File not found"
msgstr "Datoteka nije pronađena"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr ""
@@ -913,7 +913,7 @@ msgid ""
"available:\n"
msgstr ""
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1212,135 +1212,135 @@ msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr "[Instalirano]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ali je %s instaliran"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ali se %s treba instalirati"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ali se ne može instalirati"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ali je virtuelni paket"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ali nije instaliran"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ali se neće instalirati"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " ili"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Slijedeći paketi će biti UKLONJENI:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Slijedeći paketi su zadržani:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr ""
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
@@ -1349,7 +1349,7 @@ msgstr ""
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1357,21 +1357,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1535,7 +1535,7 @@ msgstr "Ne mogu otvoriti %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -1837,47 +1837,47 @@ msgstr ""
msgid "Malformed override %s line %llu #3"
msgstr ""
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr ""
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr ""
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr ""
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr ""
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr ""
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr ""
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr ""
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr ""
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr ""
@@ -1991,12 +1991,12 @@ msgstr ""
msgid "Duplicate conf file %s/%s"
msgstr ""
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, fuzzy, c-format
msgid "Failed to write file %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -2374,22 +2374,22 @@ msgstr ""
msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr ""
@@ -2639,7 +2639,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
@@ -2807,35 +2807,35 @@ msgstr ""
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2843,24 +2843,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2896,88 +2896,81 @@ msgstr "Ne mogu otvoriti DB datoteku %s"
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr ""
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "Pogrešan CD"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
#, fuzzy
msgid "Waiting for disc...\n"
msgstr "ÄŒekam na zaglavlja"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "Pogrešan CD"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
#, fuzzy
msgid "Copying package lists..."
msgstr "ÄŒitam spiskove paketa"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index f5d32b07a..5b77752af 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -157,7 +157,7 @@ msgstr " Etiqueta del paquet: "
msgid " Version table:"
msgstr " Taula de versió:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -255,12 +255,12 @@ msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»"
msgid "Please insert a Disc in the drive and press enter"
msgstr "Inseriu un disc en la unitat i premeu Intro"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "No s'ha pogut muntar «%s» a «%s»"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repetiu aquest procés per a la resta de CD del vostre joc."
@@ -760,12 +760,12 @@ msgstr "No s'ha trobat el disc"
msgid "File not found"
msgstr "Fitxer no trobat"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "L'estat ha fallat"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "No s'ha pogut establir el temps de modificació"
@@ -1031,7 +1031,7 @@ msgstr ""
"Les signatures següents no s'han pogut verificar perquè la clau pública no "
"està disponible:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Els fitxers buits no poden ser arxius vàlids"
@@ -1357,108 +1357,108 @@ msgstr "Voleu instaŀlar aquests paquets sense verificar-los?"
msgid "Failed to fetch %s %s\n"
msgstr "No s'ha pogut obtenir %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Instaŀlat]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Els següents paquets tenen dependències sense satisfer:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "però està instaŀlat %s"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "però s'instaŀlarà %s"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "però no és instaŀlable"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "però és un paquet virtual"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "però no està instaŀlat"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "però no serà instaŀlat"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "S'instaŀlaran els paquets NOUS següents:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Es SUPRIMIRAN els paquets següents:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "S'han mantingut els paquets següents:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "S'actualitzaran els paquets següents:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Es DESACTUALITZARAN els paquets següents:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Es canviaran els paquets retinguts següents:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (per %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1466,27 +1466,27 @@ msgstr ""
"AVÃS: Es suprimiran els paquets essencials següents.\n"
"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualitzats, %lu nous a instaŀlar, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstaŀlats, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a suprimir i %lu no actualitzats.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instaŀlats o suprimits completament.\n"
@@ -1495,7 +1495,7 @@ msgstr "%lu no instaŀlats o suprimits completament.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1503,21 +1503,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -1689,7 +1689,7 @@ msgstr "No es pot llegir el fitxer rèplica «%s»"
msgid "[Mirror: %s]"
msgstr "[Rèplica: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "No s'ha pogut crear el conducte IPC al subprocés"
@@ -2046,47 +2046,47 @@ msgstr "Línia predominant %s malformada %llu núm 2"
msgid "Malformed override %s line %llu #3"
msgstr "Línia predominant %s malformada %llu núm 3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Algorisme de compressió desconegut '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "La sortida comprimida %s necessita un joc de compressió"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "No s'ha pogut crear FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "No s'ha pogut bifurcar"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Comprimeix el fil"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "S'ha produït un error intern, no s'ha pogut crear %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Ha fallat l'E/S del subprocés sobre el fitxer"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "No s'ha pogut llegir mentre es calculava la suma MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "S'ha trobat un problema treient l'enllaç %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "No s'ha pogut canviar el nom de %s a %s"
@@ -2221,12 +2221,12 @@ msgstr "Afegit doble d'una desviació %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Fitxer de conf. duplicat %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "No s'ha pogut escriure el fitxer %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Ha fallat el tancament del fitxer %s"
@@ -2614,22 +2614,22 @@ msgstr "llegits, falten %llu per llegir, però no queda res"
msgid "write, still have %llu to write but couldn't"
msgstr "escrits, falten %llu per escriure però no s'ha pogut"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Ha hagut un problema en tancar el fitxer %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Ha hagut un problema en sincronitzar el fitxer"
@@ -2891,7 +2891,7 @@ msgstr ""
"No es poden corregir els problemes, teniu paquets retinguts que estan "
"trencats."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta el directori de llistes %spartial."
@@ -3071,7 +3071,7 @@ msgstr "La mida no concorda"
msgid "Invalid file format"
msgstr "Operació no vàlida %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3080,16 +3080,16 @@ msgstr ""
"No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia "
"al sources.list o fitxer malformat)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3098,12 +3098,12 @@ msgstr ""
"El fitxer Release per a %s ha caducat (invàlid des de %s). Les "
"actualitzacions per a aquest dipòsit no s'aplicaran."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3114,12 +3114,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "S'ha produït un error amb el GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3129,12 +3129,12 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "No es troba una font per baixar la versió «%s» de «%s»"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3172,50 +3172,41 @@ msgstr "El camp «Date» al fitxer Release %s és invàlid"
msgid "Vendor block %s contains no fingerprint"
msgstr "El camp del proveïdor %s no té una empremta digital"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"S'està utilitzant el punt de muntatge de CD-ROM %s\n"
-"S'està muntant el CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "S'està identificant…"
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "S'esta desmuntant el CD-ROM…\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "S'està desmuntant el CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "S'està esperant al disc…\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "S'està muntant el CD-ROM…\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "S'està identificant…"
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "S'esta desmuntant el CD-ROM…\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "S'està analitzant el disc per a fitxers d'índex…\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3224,7 +3215,7 @@ msgstr ""
"S'han trobat %zu índexos de paquets, %zu índexos de fonts, %zu indexos de "
"traduccions i %zu signatures\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3232,16 +3223,16 @@ msgstr ""
"No s'ha trobat cap fitxer de paquets, potser no és un disc de Debian o la "
"arquitectura és incorrecta?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "S'ha trobat l'etiqueta «%s»\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3250,15 +3241,15 @@ msgstr ""
"El disc es diu:\n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "S'estan copiant les llistes de paquets…"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "S'està escrivint una nova llista de fonts\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
@@ -3568,6 +3559,13 @@ msgid "Not locked"
msgstr "No blocat"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "S'està utilitzant el punt de muntatge de CD-ROM %s\n"
+#~ "S'està muntant el CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 2ff4c08fa..3f74994f9 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -154,7 +154,7 @@ msgstr " Vypíchnutý balík: "
msgid " Version table:"
msgstr " Tabulka verzí:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -247,12 +247,12 @@ msgstr "Zadejte prosím název tohoto média, např. „Debian 5.0.3 Disk 1“"
msgid "Please insert a Disc in the drive and press enter"
msgstr "Vložte prosím médium do mechaniky a stiskněte enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Selhalo připojení „%s“ na „%s“"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Tento proces opakujte pro všechna zbývající média."
@@ -758,12 +758,12 @@ msgstr "Disk nebyl nalezen."
msgid "File not found"
msgstr "Soubor nebyl nalezen"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Selhalo vyhodnocení"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Nelze nastavit Äas modifikace"
@@ -1024,7 +1024,7 @@ msgstr ""
"Následující podpisy nemohly být ověřeny, protože není dostupný veřejný "
"klíÄ:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Prázdné soubory nejsou platnými archivy"
@@ -1346,108 +1346,108 @@ msgstr "Instalovat tyto balíky bez ověření?"
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr "[Instalovaný]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Následující balíky mají nesplněné závislosti:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ale %s je nainstalován"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s se bude instalovat"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ale nedá se nainstalovat"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ale je to virtuální balík"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ale není nainstalovaný"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ale nebude se instalovat"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " nebo"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Následující NOVÉ balíky budou nainstalovány:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Následující balíky budou ODSTRANĚNY:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Následující balíky budou aktualizovány:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Následující balíky budou DEGRADOVÃNY:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Následující podržené balíky budou změněny:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvůli %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1455,27 +1455,27 @@ msgstr ""
"VAROVÃNÃ: Následující nezbytné balíky budou odstranÄ›ny.\n"
"Pokud přesně nevíte, co děláte, NEDĚLEJTE to!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizováno, %lu nově instalováno, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu přeinstalováno, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalováno nebo odstranÄ›no pouze ÄásteÄnÄ›.\n"
@@ -1484,7 +1484,7 @@ msgstr "%lu instalováno nebo odstranÄ›no pouze ÄásteÄnÄ›.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1492,21 +1492,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -1679,7 +1679,7 @@ msgstr "Nelze Äíst soubor se zrcadly „%s“"
msgid "[Mirror: %s]"
msgstr "[Zrcadlo: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Selhalo vytvoření meziprocesové roury k podprocesu"
@@ -2029,47 +2029,47 @@ msgstr "Zkomolený override soubor %s, řádek %llu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Zkomolený override soubor %s, řádek %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Neznámý kompresní algoritmus „%s“"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Komprimovaný výstup %s potřebuje kompresní sadu"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Selhalo vytvoření FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Volání fork() se nezdařilo"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Komprimovat potomka"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Interní chyba, nezdařilo se vytvořit %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "V/V operace s podprocesem/souborem selhala"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Chyba Ätení pÅ™i výpoÄtu MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problém s odlinkováním %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Selhalo přejmenování %s na %s"
@@ -2203,12 +2203,12 @@ msgstr "Dvojí přidání diverze %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Duplicitní konfiguraÄní soubor %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Selhal zápis souboru %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Selhalo zavření souboru %s"
@@ -2590,22 +2590,22 @@ msgstr "Ätení, stále mám k pÅ™eÄtení %llu, ale už nic nezbývá"
msgid "write, still have %llu to write but couldn't"
msgstr "zápis, stále mám %llu k zápisu, ale nejde to"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problém při zavírání souboru %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problém při přejmenování souboru %s na %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problém při odstraňování souboru %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problém při synchronizování souboru"
@@ -2860,7 +2860,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Adresář seznamů %spartial chybí."
@@ -3032,7 +3032,7 @@ msgstr "Velikosti nesouhlasí"
msgid "Invalid file format"
msgstr "Neplatná operace %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3041,16 +3041,16 @@ msgstr ""
"V souboru Release nelze najít oÄekávanou položku „%s“ (chybný sources.list "
"nebo porušený soubor)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "V souboru Release nelze najít kontrolní souÄet „%s“"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "K následujícím ID klíÄů není dostupný veÅ™ejný klíÄ:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3059,12 +3059,12 @@ msgstr ""
"Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
"repositáře se nepoužijí."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktní distribuce: %s (oÄekáváno %s, obdrženo %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3074,12 +3074,12 @@ msgstr ""
"se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3088,12 +3088,12 @@ msgstr ""
"Nebylo možné nalézt soubor s balíkem %s. To by mohlo znamenat, že tento "
"balík je tÅ™eba opravit ruÄnÄ› (kvůli chybÄ›jící architektuÅ™e)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3130,50 +3130,41 @@ msgstr "Neplatná položka „Date“ v Release souboru %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Blok výrobce %s neobsahuje otisk klíÄe"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Používám přípojný bod %s\n"
-"Připojuji CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Rozpoznávám… "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Uložený název: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Odpojuji CD-ROM…\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Používám přípojný bod %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Odpojuji CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Čekám na disk…\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Připojuji CD-ROM…\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Rozpoznávám… "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Uložený název: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Odpojuji CD-ROM…\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Hledám na disku indexové soubory…\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3182,7 +3173,7 @@ msgstr ""
"Nalezeny indexy balíků (%zu), indexy zdrojů (%zu), indexy popisů (%zu) a "
"podpisy (%zu)\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3190,16 +3181,16 @@ msgstr ""
"Nenalezeny žádné balíky. Možná to není disk s Debianem, nebo je pro jinou "
"architekturu?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Nalezený název: „%s“\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Nejedná se o platné jméno, zkuste to znovu.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3208,15 +3199,15 @@ msgstr ""
"Tento disk se nazývá: \n"
"„%s“\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopíruji seznamy balíků…"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Zapisuji nový seznam balíků\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Seznamy zdrojů na tomto disku jsou:\n"
@@ -3513,6 +3504,13 @@ msgid "Not locked"
msgstr "Není uzamÄen"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Používám přípojný bod %s\n"
+#~ "Připojuji CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/cy.po b/po/cy.po
index 14c656a47..b971b013b 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -173,7 +173,7 @@ msgstr " Pin Pecyn: "
msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -274,12 +274,12 @@ msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Methwyd ailenwi %s at %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -767,12 +767,12 @@ msgstr "Ffeil heb ei ganfod"
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -1036,7 +1036,7 @@ msgid ""
"available:\n"
msgstr ""
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1359,111 +1359,111 @@ msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " neu"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -1473,27 +1473,27 @@ msgstr ""
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
@@ -1502,7 +1502,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1510,21 +1510,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -1693,7 +1693,7 @@ msgstr "Methwyd agor ffeil %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Methwyd creu pibell cyfathrebu at isbroses"
@@ -2053,48 +2053,48 @@ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, fuzzy, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Dull Cywasgu Anhysbys '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Methwyd creu FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Methodd fork()"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
#, fuzzy
msgid "Compress child"
msgstr "Plentyn Cywasgu"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, fuzzy, c-format
msgid "Internal error, failed to create %s"
msgstr "Gwall Mewnol, Methwyd creu %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Methodd MA i isbroses/ffeil"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Methwyd darllen wrth gyfrifo MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Gwall wrth datgysylltu %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
@@ -2234,12 +2234,12 @@ msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Ffeil cyfluniad dyblyg %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, fuzzy, c-format
msgid "Failed to write file %s"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Methwyd cau ffeil %s"
@@ -2628,22 +2628,22 @@ msgstr "o hyd %lu i ddarllen ond dim ar ôl"
msgid "write, still have %llu to write but couldn't"
msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
@@ -2912,7 +2912,7 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
@@ -3093,7 +3093,7 @@ msgstr "Camgyfatebiaeth maint"
msgid "Invalid file format"
msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3101,28 +3101,28 @@ msgid ""
msgstr ""
# FIXME: number?
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3130,13 +3130,13 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3145,12 +3145,12 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3189,89 +3189,82 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr ""
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
#, fuzzy
msgid "Waiting for disc...\n"
msgstr "Yn aros am benawdau"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
#, fuzzy
msgid "Copying package lists..."
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
#, fuzzy
msgid "Writing new source list\n"
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr ""
diff --git a/po/da.po b/po/da.po
index ce9926c70..aea3dc547 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -160,7 +160,7 @@ msgstr " Pakke-pin: "
msgid " Version table:"
msgstr " Versionstabel:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -259,12 +259,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Indsæt en disk i drevet og tryk retur"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Kunne ikke montere %s til %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Gentag processen for resten af cd'erne i dit sæt."
@@ -786,12 +786,12 @@ msgstr "Disk blev ikke fundet."
msgid "File not found"
msgstr "Fil blev ikke fundet"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Kunne ikke finde"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Kunne ikke angive ændringstidspunkt"
@@ -1056,7 +1056,7 @@ msgstr ""
"Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er "
"tilgængelig:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Tomme filer kan ikke være gyldige arkiver"
@@ -1376,105 +1376,105 @@ msgstr "Installér disse pakker uden verifikation?"
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr "installeret,kan opgraderes til: "
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
msgid "[installed,local]"
msgstr "[Installeret,lokalt]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr "[installeret,kan auto-fjernes]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
msgid "[installed,automatic]"
msgstr "[Installeret,automatisk]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
msgid "[installed]"
msgstr "[Installeret]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, fuzzy, c-format
msgid "[upgradable from: %s]"
msgstr "[kan opgraderes fra: "
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr "[residual-konfig]"
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Følgende pakker har uopfyldte afhængigheder:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "men %s er installeret"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "men %s forventes installeret"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "men den kan ikke installeres"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "men det er en virtuel pakke"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "men den er ikke installeret"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "men den bliver ikke installeret"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil blive installeret:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil blive AFINSTALLERET:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er blevet holdt tilbage:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil blive opgraderet:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil blive NEDGRADERET:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Følgende tilbageholdte pakker vil blive ændret:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (grundet %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1482,27 +1482,27 @@ msgstr ""
"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu opgraderes, %lu nyinstalleres, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstalleres, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderes, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
@@ -1511,7 +1511,7 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1519,21 +1519,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulært udtryk - %s"
@@ -1704,7 +1704,7 @@ msgstr "Ingen post fundet i spejlfil »%s«"
msgid "[Mirror: %s]"
msgstr "[Spejl: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Kunne ikke oprette IPC-videreførsel til underproces"
@@ -2061,47 +2061,47 @@ msgstr "Ugyldig gennemtvangs %s-linje %llu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Ugyldig gennemtvangs %s-linje %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Ukendt komprimeringsalgoritme »%s«"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Komprimerede uddata %s kræver et komprimeringssæt"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Kunne ikke oprette FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Kunne ikke spalte"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Komprimer barn"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Intern fejl. Kunne ikke oprette %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "IO til underproces/fil mislykkedes"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Kunne ikke læse under beregning af MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problem under aflænkning af %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Kunne ikke omdøbe %s til %s"
@@ -2236,12 +2236,12 @@ msgstr "Dobbelt tilføjelse af omrokering %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Dobbelt opsætningsfil %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Kunne ikke skrive filen %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Kunne ikke lukke filen %s"
@@ -2622,22 +2622,22 @@ msgstr "læs, mangler stadig at læse %llu men der er ikke flere"
msgid "write, still have %llu to write but couldn't"
msgstr "skriv, mangler stadig at skrive %llu men kunne ikke"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem under lukning af filen %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem under omdøbning af filen %s til %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Fejl ved frigivelse af filen %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problem under synkronisering af fil"
@@ -2895,7 +2895,7 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listemappen %spartial mangler."
@@ -3067,7 +3067,7 @@ msgstr "Størrelsen stemmer ikke"
msgid "Invalid file format"
msgstr "Ugyldigt filformat"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3076,17 +3076,17 @@ msgstr ""
"Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
"punkt eller forkert udformet fil)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3095,12 +3095,12 @@ msgstr ""
"Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
"arkiv vil ikke blive anvendt."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3110,12 +3110,12 @@ msgstr ""
"og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fejl: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3124,12 +3124,12 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3165,50 +3165,41 @@ msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Leverandørblok %s inderholder intet fingeraftryk"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Bruger cdrom-monteringspunktet %s\n"
-"Monterer cdrom\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identificerer .. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-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"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Bruger cdrom-monteringspunktet %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Afmonterer cdrom\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Venter på disken ...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Monterer cdrom ...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identificerer .. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Gemt mærkat: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Afmonterer cdrom ...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Skanner disken for indeksfiler ..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3217,7 +3208,7 @@ msgstr ""
"Fandt %zu pakkeindekser, %zu kildeindekser, %zu oversættelsesindekser og %zu "
"signaturer\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3225,16 +3216,16 @@ msgstr ""
"Kunne ikke finde nogen pakkefiler, det er muligvis ikke en Debiandisk eller "
"den forkerte arkitektur?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Fandt mærkatet »%s«\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikke et gyldigt navn, prøv igen.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3243,15 +3234,15 @@ msgstr ""
"Denne disk hedder: \n"
"»%s«\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopierer pakkelisterne ..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Skriver ny kildeliste\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Denne disk har følgende kildeliste-indgange:\n"
@@ -3547,6 +3538,13 @@ msgid "Not locked"
msgstr "Ikke låst"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Bruger cdrom-monteringspunktet %s\n"
+#~ "Monterer cdrom\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/de.po b/po/de.po
index 718a8c300..b09db2f4b 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -161,7 +161,7 @@ msgstr " Paket-Pinning: "
msgid " Version table:"
msgstr " Versionstabelle:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -260,12 +260,12 @@ msgstr ""
"Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die "
"Eingabetaste (Enter)."
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "»%s« konnte nicht in »%s« eingebunden werden."
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
"Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes."
@@ -796,12 +796,12 @@ msgid "File not found"
msgstr "Datei nicht gefunden"
# looks like someone hardcoded English grammar
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Abfrage mit »stat« fehlgeschlagen"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Änderungszeitpunkt kann nicht gesetzt werden."
@@ -1071,7 +1071,7 @@ msgstr ""
"öffentlicher\n"
"Schlüssel nicht verfügbar ist:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Leere Dateien können kein gültiges Archiv sein."
@@ -1401,109 +1401,109 @@ msgstr "Diese Pakete ohne Überprüfung installieren?"
msgid "Failed to fetch %s %s\n"
msgstr "Fehlschlag beim Holen von %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Installiert]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "aber %s ist installiert"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "aber %s soll installiert werden"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ist aber nicht installierbar"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ist aber ein virtuelles Paket"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ist aber nicht installiert"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "soll aber nicht installiert werden"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " oder"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Die folgenden NEUEN Pakete werden installiert:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Die folgenden Pakete werden ENTFERNT:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr ""
"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegen %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1511,27 +1511,27 @@ msgstr ""
"WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n"
"Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu durch eine ältere Version ersetzt, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nicht vollständig installiert oder entfernt.\n"
@@ -1540,7 +1540,7 @@ msgstr "%lu nicht vollständig installiert oder entfernt.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1548,21 +1548,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
@@ -1735,7 +1735,7 @@ msgstr "Datei »%s« von Spiegelserver kann nicht gelesen werden."
msgid "[Mirror: %s]"
msgstr "[Spiegelserver: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
@@ -2100,47 +2100,47 @@ msgstr "Missgestaltetes Override %s Zeile %llu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Missgestaltetes Override %s Zeile %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Unbekannter Komprimierungsalgorithmus »%s«"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz."
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "FILE* konnte nicht erzeugt werden."
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Fork fehlgeschlagen"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Komprimierungs-Kindprozess"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Interner Fehler, %s konnte nicht erzeugt werden."
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "E/A zu Kindprozess/Datei fehlgeschlagen"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problem beim Entfernen (unlink) von %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s konnte nicht in %s umbenannt werden."
@@ -2276,12 +2276,12 @@ msgstr "Doppelte Hinzufügung der Umleitung %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Doppelte Konfigurationsdatei %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Datei %s konnte nicht geschrieben werden."
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Datei %s konnte nicht geschlossen werden."
@@ -2674,22 +2674,22 @@ msgstr ""
"Schreibvorgang: es verbleiben noch %llu zu schreiben, Schreiben ist jedoch "
"nicht möglich."
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem beim Schließen der Datei %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem beim Umbenennen der Datei %s nach %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem beim Entfernen (unlink) der Datei %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problem beim Synchronisieren der Datei"
@@ -2951,7 +2951,7 @@ msgstr ""
"Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte "
"Pakete."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listenverzeichnis %spartial fehlt."
@@ -3138,7 +3138,7 @@ msgstr "Größe stimmt nicht überein"
msgid "Invalid file format"
msgstr "Ungültige Operation %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3147,17 +3147,17 @@ msgstr ""
"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
"(falscher Eintrag in sources.list oder missgebildete Datei)."
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden."
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3166,12 +3166,12 @@ msgstr ""
"Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für "
"dieses Depot werden nicht angewendet."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3182,12 +3182,12 @@ msgstr ""
"GPG-Fehler: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-Fehler: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3197,14 +3197,14 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« "
"herunterzuladen."
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3241,50 +3241,41 @@ msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Herstellerblock %s enthält keinen Fingerabdruck."
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Verwendeter CD-ROM-Einbindungspunkt: %s\n"
-"CD-ROM wird eingebunden.\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identifizieren ... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Gespeicherte Kennzeichnung: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Einbindung der CD-ROM wird gelöst ...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Verwendeter CD-ROM-Einbindungspunkt: %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Lösen der CD-ROM-Einbindung\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Warten auf Medium ...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "CD-ROM wird eingebunden ...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identifizieren ... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Gespeicherte Kennzeichnung: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Einbindung der CD-ROM wird gelöst ...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3293,7 +3284,7 @@ msgstr ""
"%zu Paketindizes, %zu Quellindizes, %zu Ãœbersetzungsindizes und %zu "
"Signaturen gefunden\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3301,16 +3292,16 @@ msgstr ""
"Es konnten keine Paketdateien gefunden werden; möglicherweise ist dies keine "
"Debian-Disk oder eine für die falsche Architektur?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Kennzeichnung »%s« gefunden\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3319,15 +3310,15 @@ msgstr ""
"Dieses Medium heißt: \n"
"»%s«\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopieren der Paketlisten ..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Schreiben der neuen Quellliste\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Quelllisteneinträge für dieses Medium sind:\n"
@@ -3641,6 +3632,13 @@ msgid "Not locked"
msgstr "Nicht gesperrt"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Verwendeter CD-ROM-Einbindungspunkt: %s\n"
+#~ "CD-ROM wird eingebunden.\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/dz.po b/po/dz.po
index ec6a7aaea..58d1e9abf 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -161,7 +161,7 @@ msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་à½à½–་གཟེར:"
msgid " Version table:"
msgstr "à½à½¼à½“་རིམ་à½à½²à½‚་à½à¾²à½˜à¼:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -261,12 +261,12 @@ msgstr "ཌིསིཀ་འདི་གི་དོན་ལུ་མིང་
msgid "Please insert a Disc in the drive and press enter"
msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབà¼"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "%s་ལུ་%s་བསà¾à¾±à½¢à¼‹à½˜à½²à½„་བà½à½‚ས་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "à½à¾±à½¼à½‘་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསà¾à¾±à½¢à¼‹à½ à½–དà¼"
@@ -742,12 +742,12 @@ msgstr "ཌིཀསི་དེ་འཚོལ་མ་à½à½¼à½–à¼"
msgid "File not found"
msgstr "ཡིག་སྣོད་འཚོལ་མ་à½à½¼à½–à¼"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབà½à¼‹à½“ི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
@@ -1011,7 +1011,7 @@ msgid ""
msgstr ""
"འོག་གི་མིང་རྟགས་ཚུ་བདེན་སྦྱོར་་འབད་མ་ཚུགས་ག་ཅི་སྦེ་ཟེར་བ་ཅིན་མི་དམང་ལྡེ་མིག་དེ་འà½à½¼à½–་མི་ཚུགས་པས:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1326,108 +1326,108 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [གཞི་བཙུགས་འབད་ཡོདà¼]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [གཞི་བཙུགས་འབད་ཡོདà¼]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [གཞི་བཙུགས་འབད་ཡོདà¼]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [གཞི་བཙུགས་འབད་ཡོདà¼]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "འདི་འབདà½à¼‹à½‘་%s་འདི་གཞི་བཙུགས་འབད་ཡོདà¼"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "འདི་འབདà½à¼‹à½‘་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིནà¼"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "འདི་འབདà½à¼‹à½‘་%s་འདི་གཟི་བཙུགས་འབད་མི་བà½à½´à½–་པསà¼"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "འདི་འབདà½à¼‹à½‘་ འདི་བར་ཅུ་ཡལ་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཅིག་ཨིན་པསà¼"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "འདི་འབདà½à¼‹à½‘་འདི་གཞི་བཙུགས་མ་འབད་བསà¼"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "འདི་འབདà½à¼‹à½‘་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པསà¼"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr "ཡང་ནà¼"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིས་གསརཔ་འདི་ཚུ་à½à½žà½²à¼‹à½–ཙུགས་འབད་འོང་:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ཚུ་རྩ བསà¾à¾²à½‘་གà½à½„་འོང་:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་ཚུ་ཡར་བསà¾à¾±à½ºà½‘་འབད་འོང་:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "འོག་གི་à½à½´à½˜à¼‹à½¦à¾’ྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "འོག་གི་འཆང་ཡོད་པའི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s( %s་གིས་སྦེ)"
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1435,27 +1435,27 @@ msgstr ""
"ཉེན་བརྡ:འོག་གི་ཉོ་མà½à½¼à¼‹à½–འི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཚུ་རྩ་བསà¾à¾²à½‘་གà½à½„་འོང་à¼\n"
"à½à¾±à½¼à½‘་ཀྱིས་à½à¾±à½¼à½‘་རང་ག་ཅི་འབདà½à¼‹à½¨à½²à½“་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་à¼!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu་ཡར་བསà¾à¾±à½ºà½‘་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོདà¼"
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོདà¼"
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོདà¼"
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "རྩ་བསà¾à¾²à½‘་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསà¾à¾±à½ºà½‘་མ་འབད་བསà¼\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསà¾à¾²à½‘་མ་གà½à½„་པསà¼\n"
@@ -1464,7 +1464,7 @@ msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1472,21 +1472,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "à½à½ à½²à¼"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -1654,7 +1654,7 @@ msgstr "%s་ཡིག་སྣོད་འདི་à½à¼‹à½•à¾±à½ºà¼‹à½˜à¼‹à½šà
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་ཨའི་པི་སི་རྒྱུད་དུང་གསར་བསà¾à¾²à½´à½“་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདཔà¼"
@@ -2016,47 +2016,47 @@ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག
msgid "Malformed override %s line %llu #3"
msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་à½à½²à½‚%lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "ཨེབ་བཙུགས་འབད་ཡོད་པའི་ཨའུཊི་པུཊི་%sལུ་ཨེབ་བཙུགས་ཆ་ཚན་ཅིག་དགོཔ་འདུག"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "ཡིག་སྣོད་*་ གསར་བསà¾à¾²à½´à½“་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "à½à¼‹à½¦à¾¤à½ºà½£à¼‹à½ à½–ད་ནི་ལུ་འà½à½´à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "ཆ་ལག་ཨེབ་བཙུགས་འབདà¼"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "ནང་འà½à½¼à½‘་འཛོལ་བ་ %s་གསར་བསà¾à¾²à½´à½“་འབད་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "ཡན་ལག་ལས་སྦྱོར་ལུ་IO/ཡིག་སྣོད་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "ཨེམ་ཌི་༥་གློག་རིག་རà¾à¾±à½–་པའི་སà¾à½–ས་ལྷག་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "%s་འབྲེལ་འà½à½´à½‘་མེདཔ་བཟོ་ནི་ལུ་དཀའ་ངལà¼"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s་ལུ་%s་བསà¾à¾±à½¢à¼‹à½˜à½²à½„་བà½à½‚ས་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
@@ -2193,12 +2193,12 @@ msgstr "%s -> %s་à½à¼‹à½•à¾±à½¼à½‚ས་ཀྱི་ལོག་བལྟབà
msgid "Duplicate conf file %s/%s"
msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s/%s་འདི་ངོ་བཤུས་བཟོà¼"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "%s་ཡིག་སྣོད་འདི་à½à¼‹à½–སྡམས་ནི་ལུ་འà½à½´à½¦à¼‹à½¤à½¼à½¢à¼‹à½–ྱུང་ཡོདà¼"
@@ -2577,22 +2577,22 @@ msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%
msgid "write, still have %llu to write but couldn't"
msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབà½à¼‹à½‘་འབད་མ་ཚུགསà¼"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "ཡིག་སྣོད་འདི་à½à¼‹à½–སྡམས་པའི་བསྒང་དཀའ་ངལà¼"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདà½à¼‹à½‘་དཀའ་ངལà¼"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལà¼"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདà½à¼‹à½‘་དཀའ་ངལà¼"
@@ -2850,7 +2850,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ à½à¾±à½¼à½‘་ཀྱི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "à½à½¼à¼‹à½–ཀོད་འབད་མི་སྣོད་à½à½¼à¼‹%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་à½à½ºà¼‹à½ à½‘ུག"
@@ -3022,35 +3022,35 @@ msgstr "ཚད་མ་མà½à½´à½“à¼"
msgid "Invalid file format"
msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (༡་)་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགསà¼"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འà½à½¼à½–་མི་ཚུགས་པས:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3058,12 +3058,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3072,12 +3072,12 @@ msgstr ""
" %s་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འà½à½¼à½–་པས༠འདི་འབདà½à¼‹à½£à½¦à¼‹à½à¾±à½¼à½‘་ཀྱི་ལག་à½à½¼à½‚་ལས་ "
"འ་ནི་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེནà¼)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3114,73 +3114,64 @@ msgstr "%s (༡་)་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་ཡིག་སྣོད་à
msgid "Vendor block %s contains no fingerprint"
msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-" %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འà½à½–་དོà¼\n"
-"སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོà¼\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "ངོས་འཛིན་འབད་དོ.."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་à½à¼‹à½¡à½²à½‚:%s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..."
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འà½à½–་དོà¼\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "སི་ཌི་-རོམ་བརྩེགས་བཤོལ་འབད་དོà¼\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "ཌིསིཀ་གི་དོན་ལུ་བསྒུག་དོ...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "ངོས་འཛིན་འབད་དོ.."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་à½à¼‹à½¡à½²à½‚:%s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..."
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "ཟུར་à½à½¼à¼‹à½¡à½²à½‚་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, fuzzy, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr "%i་à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱི་ཟུར་à½à½¼à¼‹à½šà½´à¼‹à½à½¼à½–་ཅི་ %i་འབྱུང་à½à½´à½„ས་ཟུར་à½à½¼à¼‹à½šà½´à¼‹à½‘ང་ %iམིང་རྟགས་ཚུà¼\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, fuzzy, c-format
msgid "Found label '%s'\n"
msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་à½à¼‹à½¡à½²à½‚:%s \n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "དེ་ནུས་ཅན་གྱི་མིང་ཅིག་མེན་པས་ ལོག་སྟེ་རང་འབད་རྩོལ་བསà¾à¾±à½ºà½‘à¼\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3189,15 +3180,15 @@ msgstr ""
"ཌིསིཀ་འདི་བོད་བརྡ་འབད་དོ་ཡོདཔ་ཨིནà¼\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "à½à½´à½˜à¼‹à½¦à¾’ྲིལ་གྱིà½à½¼à¼‹à½¡à½²à½‚་ཚུ་འདྲ་བཤུས་རà¾à¾±à½–་དོ..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "འབྱུང་à½à½´à½„ས་ཀྱི་à½à½¼à¼‹à½¡à½²à½‚་གསརཔ་ཅིག་འབྲི་དོà¼\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་à½à½´à½„ས་ཧྲིལ་བུ་ཚུ་:\n"
@@ -3482,6 +3473,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འà½à½–་དོà¼\n"
+#~ "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོà¼\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འà½à½´à¼‹à½ à½–ད་དོà¼\n"
diff --git a/po/el.po b/po/el.po
index 9f99d4de3..0d91aceef 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -166,7 +166,7 @@ msgstr " Καθήλωση Πακέτου: "
msgid " Version table:"
msgstr " Πίνακας Έκδοσης:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -266,12 +266,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr "ΠαÏακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Αποτυχία σÏνδεσης του %s σε %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας."
@@ -753,12 +753,12 @@ msgstr "Ο δίσκος δεν βÏέθηκε."
msgid "File not found"
msgstr "Το αÏχείο Δε Î’Ïέθηκε"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Αποτυχία εÏÏεσης της κατάστασης"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Αποτυχία οÏÎ¹ÏƒÎ¼Î¿Ï Ï„Î¿Ï… χÏόνου Ï„Ïοποποίησης"
@@ -1024,7 +1024,7 @@ msgstr ""
"Οι παÏακάτω υπογÏαφές δεν ήταν δυνατόν να επαληθευτοÏν επειδή δεν ήταν "
"διαθέσιμο το δημόσιο κλειδί:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1344,108 +1344,108 @@ msgstr "Εγκατάσταση των πακέτων χωÏίς επαλήθευ
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Εγκατεστημένα]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαÏτήσεις:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "αλλά το %s είναι εγκατεστημένο"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "αλλά το %s Ï€Ïόκειται να εγκατασταθεί"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "αλλά δεν είναι εγκαταστάσημο"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "αλλά είναι ένα εικονικό πακέτο"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "αλλά δεν είναι εγκατεστημένο"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "αλλά δεν Ï€Ïόκειται να εγκατασταθεί"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " η"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Τα ακόλουθα ÎΕΑ πακέτα θα εγκατασταθοÏν:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥÎ:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστοÏν:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥÎ:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Τα ακόλουθα κÏατημένα πακέτα θα αλλαχθοÏν:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (λόγω του %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1453,27 +1453,27 @@ msgstr ""
"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαÏαίτητα πακέτα θα αφαιÏεθοÏν\n"
"Αυτό ΔΕΠθα έπÏεπε να συμβεί, εκτός αν ξέÏετε τι ακÏιβώς κάνετε!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu επανεγκατεστημένα,"
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu υποβαθμισμένα, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu θα αφαιÏεθοÏν και %lu δεν αναβαθμίζονται.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu μη πλήÏως εγκατεστημένα ή αφαιÏέθηκαν.\n"
@@ -1482,7 +1482,7 @@ msgstr "%lu μη πλήÏως εγκατεστημένα ή αφαιÏέθηκα
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[Î/ο]"
@@ -1490,21 +1490,21 @@ msgstr "[Î/ο]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[ν/Ο]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -1674,7 +1674,7 @@ msgstr "ΑδÏνατο το άνοιγμα του αÏχείου %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Αποτυχία κατά τη δημιουÏγία διασωλήνωσης IPC στην υποδιεÏγασία"
@@ -2036,47 +2036,47 @@ msgstr "ΚακογÏαμμένη παÏακαμπτήÏια %s γÏαμμή %lu
msgid "Malformed override %s line %llu #3"
msgstr "ΚακογÏαμμένη παÏακαμπτήÏια %s γÏαμμή %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Άγνωστος ΑλγόÏιθμος Συμπίεσης '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Η συμπιεσμένη έξοδος του %s χÏειάζεται καθοÏισμό συμπίεσης"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Αποτυχία δημιουÏγίας του ΑΡΧΕΙΟΥ"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Αποτυχία αγκίστÏωσης"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Συμπίεση απογόνου"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "ΕσωτεÏικό Σφάλμα, Αποτυχία δημιουÏγίας του %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "απέτυχε η Ε/Ε στην υποδιεÏγασία/αÏχείο"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "ΠÏόβλημα κατά την αποσÏνδεση του %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Αποτυχία μετονομασίας του %s σε %s"
@@ -2212,12 +2212,12 @@ msgstr "Διπλή Ï€Ïοσθήκη εκτÏοπής %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Διπλό αÏχείο Ïυθμίσεων %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Αποτυχία εγγÏαφής του αÏχείου %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Αποτυχία στο κλείσιμο του αÏχείου %s"
@@ -2601,22 +2601,22 @@ msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανÎ
msgid "write, still have %llu to write but couldn't"
msgstr "γÏάφτηκαν, απομένουν %lu για εγγÏαφή αλλά χωÏίς επιτυχία"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "ΠÏόβλημα κατά το κλείσιμο του αÏχείου"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "ΠÏόβλημα κατά τον συγχÏονισμό του αÏχείου"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "ΠÏόβλημα κατά την διαγÏαφή του αÏχείου"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "ΠÏόβλημα κατά τον συγχÏονισμό του αÏχείου"
@@ -2873,7 +2873,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "ΑδÏνατη η διόÏθωση Ï€Ïοβλημάτων, έχετε κÏατοÏμενα ελαττωματικά πακέτα."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Ο φάκελος λιστών %spartial αγνοείται."
@@ -3051,35 +3051,35 @@ msgstr "Ανόμοιο μέγεθος"
msgid "Invalid file format"
msgstr "Μη έγκυÏη λειτουÏγία %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "ΑδÏνατη η ανάλυση του αÏχείου πακέτου %s (1)"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Δεν υπάÏχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3087,12 +3087,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3101,12 +3101,12 @@ msgstr ""
"ΑδÏνατος ο εντοπισμός ενός αÏχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χÏειάζεται να διοÏθώσετε χειÏοκίνητα το πακέτο. (λόγω χαμένου αÏχείου)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3144,50 +3144,41 @@ msgstr "ΑδÏνατη η ανάλυση του αÏχείου πακέτου %s
msgid "Vendor block %s contains no fingerprint"
msgstr "Η εγγÏαφή κατασκευαστή %s δεν πεÏιέχει ταυτότητα"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"ΧÏησιμοποιείται το σημείο Ï€ÏοσάÏτησης %s\n"
-"ΠÏοσαÏτάται το CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "ΑναγνώÏιση..."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Αποθήκευση Ετικέτας: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "ΑποπÏοσάÏτηση του CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "ΧÏησιμοποιείται το σημείο Ï€ÏοσάÏτησης %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "ΑποπÏοσάÏτηση του CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Αναμονή για δίσκο...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "ΠÏοσάÏτηση του CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "ΑναγνώÏιση..."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Αποθήκευση Ετικέτας: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "ΑποπÏοσάÏτηση του CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "ΣάÏωση του δίσκου για πεÏιεχόμενα...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3196,22 +3187,22 @@ msgstr ""
"Î’Ïέθηκαν %zu κατάλογοι πακέτων, %zu κατάλογοι πηγαίων, %zu κατάλογοι "
"μεταφÏάσεων και %zu υπογÏαφές\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "ΕÏÏεση ετικέτας: %s \n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Αυτό δεν είναι έγκυÏο όνομα, Ï€Ïοσπαθείστε ξανά. \n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3220,15 +3211,15 @@ msgstr ""
"Ο δίσκος αυτός ονομάζεται: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "ΑντιγÏαφή λιστών πακέτων..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "EγγÏαφή νέας λίστας πηγών\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Οι κατάλογοι με τις πηγές Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… δίσκου είναι: \n"
@@ -3511,6 +3502,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "ΧÏησιμοποιείται το σημείο Ï€ÏοσάÏτησης %s\n"
+#~ "ΠÏοσαÏτάται το CD-ROM\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
diff --git a/po/es.po b/po/es.po
index 9e33aaf2c..c87710e2d 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -211,7 +211,7 @@ msgstr " Pin del paquete: "
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-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -314,12 +314,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Por favor, introduzca un disco en la unidad y pulse Intro"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "No se pudo montar «%s» como «%s»"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repita este proceso para el resto de los CDs del conjunto."
@@ -813,12 +813,12 @@ msgstr "Disco no encontrado."
msgid "File not found"
msgstr "Fichero no encontrado"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "No pude leer"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "No pude poner el tiempo de modificación"
@@ -1082,7 +1082,7 @@ msgstr ""
"Las firmas siguientes no se pudieron verificar porque su llave pública no "
"está disponible:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1408,108 +1408,108 @@ msgstr "¿Instalar estos paquetes sin verificación?"
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "pero %s está instalado"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "pero %s va a ser instalado"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "pero no es instalable"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "pero es un paquete virtual"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "pero no está instalado"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "pero no va a instalarse"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Se instalarán los siguientes paquetes NUEVOS:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes se ELIMINARÃN:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes se han retenido:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Se actualizarán los siguientes paquetes:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Se DESACTUALIZARÃN los siguientes paquetes:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Se cambiarán los siguientes paquetes retenidos:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1517,27 +1517,27 @@ msgstr ""
"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizados, %lu se instalarán, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu para eliminar y %lu no actualizados.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instalados del todo o eliminados.\n"
@@ -1546,7 +1546,7 @@ msgstr "%lu no instalados del todo o eliminados.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1554,21 +1554,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilación de expresiones regulares - %s"
@@ -1740,7 +1740,7 @@ msgstr "No se encontró un archivo de réplica «%s»"
msgid "[Mirror: %s]"
msgstr "[Réplica: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falló la creación de una tubería IPC para el subproceso"
@@ -2103,47 +2103,47 @@ msgstr "Predominio mal formado %s línea %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Predominio mal formado %s línea %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Algoritmo desconocido de compresión «%s»"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Salida comprimida %s necesita una herramienta de compresión"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "No se pudo crear FICHERO*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "No se pudo bifurcar"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Hijo compresión"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Error interno, no se pudo crear %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Falló la ES a subproceso/archivo"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "No se pudo leer mientras se computaba MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Se produjo un problema al desligar %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Falló el renombre de %s a %s"
@@ -2281,12 +2281,12 @@ msgstr "Doble suma de desviación %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Archivo de configuración duplicado %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Falló la escritura del archivo %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "No pude cerrar el archivo %s"
@@ -2673,22 +2673,22 @@ msgstr "leídos, todavía debía leer %lu pero no queda nada"
msgid "write, still have %llu to write but couldn't"
msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Se produjo un problema al cerrar el fichero %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Se produjo un problema al renombrar el fichero %s a %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Se produjo un problema al desligar el fichero %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Se produjo un problema al sincronizar el fichero"
@@ -2955,7 +2955,7 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta el directorio de listas %spartial."
@@ -3132,37 +3132,37 @@ msgstr "El tamaño difiere"
msgid "Invalid file format"
msgstr "Operación inválida: %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"No existe ninguna clave pública disponible para los siguientes "
"identificadores de clave:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3173,12 +3173,12 @@ msgstr ""
"GPG es: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Error de GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3188,12 +3188,12 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3231,50 +3231,41 @@ msgstr "Entrada «Date» inválida en el archivo «Release» %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Bloque de fabricante %s sin huella digital"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Usando el punto de montaje del CD-ROM %s\n"
-"Montando el CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identificando.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Etiqueta guardada: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Desmontando el CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Usando el punto de montaje del CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Desmontando el CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Esperando el disco...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Montando el CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identificando.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Etiqueta guardada: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando el CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Buscando en el disco archivos de índices...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3283,7 +3274,7 @@ msgstr ""
"Se encontraron %zu índices de paquetes, %zu índices de fuentes, %zu índices "
"de traducción y %zu firmas\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3291,16 +3282,16 @@ msgstr ""
"No pude localizar ningún archivo de paquete, ¿quizás este no sea un disco de "
"Debian o sea de otra arquitectura?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Se encontró la etiqueta: «%s»\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Ese no es un nombre válido, inténtelo de nuevo.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3309,15 +3300,15 @@ msgstr ""
"Este disco se llama: \n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Copiando las listas de paquetes..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Escribiendo nueva lista de fuente\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Las entradas de la lista de fuentes para este disco son:\n"
@@ -3629,6 +3620,13 @@ msgid "Not locked"
msgstr "No bloqueado"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Usando el punto de montaje del CD-ROM %s\n"
+#~ "Montando el CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 8619b0b96..fbde6d3f8 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -159,7 +159,7 @@ msgstr " Paketearen pin-a:"
msgid " Version table:"
msgstr " Bertsio taula:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -257,12 +257,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Mesedez sar diska bat gailuan eta enter sakatu"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu."
@@ -741,12 +741,12 @@ msgstr "Ez da diska aurkitu"
msgid "File not found"
msgstr "Ez da fitxategia aurkitu"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Huts egin du atzitzean"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Huts egin du aldaketa ordua ezartzean"
@@ -1012,7 +1012,7 @@ msgstr ""
"Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago "
"eskuragarri:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1334,108 +1334,108 @@ msgstr "Paketeak egiaztapen gabe instalatu?"
msgid "Failed to fetch %s %s\n"
msgstr "Ezin da lortu %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Instalatuta]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "baina %s instalatuta dago"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "baina %s instalatzeko dago"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "baina ez da instalagarria"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "baina pakete birtuala da"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "baina ez dago instalatuta"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "baina ez da instalatuko"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " edo"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Ondorengo paketeak KENDUKO dira:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Ondorengo paketeak mantendu egin dira:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Ondorengo paketeak bertsio-berrituko dira:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (arrazoia: %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1443,27 +1443,27 @@ msgstr ""
"KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
"EZ ezazu horrelakorik egin, ez badakizu ondo zertan ari zaren!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu berrinstalatuta, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu aurreko bertsiora itzulita, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ez erabat instalatuta edo kenduta.\n"
@@ -1472,7 +1472,7 @@ msgstr "%lu ez erabat instalatuta edo kenduta.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[B/e]"
@@ -1480,21 +1480,21 @@ msgstr "[B/e]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[b/E]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Adierazpen erregularren konpilazio errorea - %s"
@@ -1662,7 +1662,7 @@ msgstr "%s fitxategia ezin izan da ireki"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean"
@@ -2017,47 +2017,47 @@ msgstr "Gaizki osatutako override %s, lerroa: %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "'%s' Konpresio Algoritmo Ezezaguna"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "%s irteera konprimituak konpresio-tresna bat behar du"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Huts egin du FILE* sortzean"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Huts egin du sardetzean"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Konprimatu Umeak"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Barne Errorea, Huts %s sortzerakoan"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Huts egin du MD5 konputatzean"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Arazoa %s desestekatzean"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
@@ -2192,12 +2192,12 @@ msgstr "Desbideratzearen gehitze bikoitza: %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Konfigurazio fitxategi bikoiztua: %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Ezin izan da %s fitxategian idatzi"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Ezin izan da %s fitxategia itxi"
@@ -2580,22 +2580,22 @@ msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
msgid "write, still have %llu to write but couldn't"
msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Arazoa fitxategia ixtean"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Arazoa fitxategia sinkronizatzean"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Arazoa fitxategia desestekatzean"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Arazoa fitxategia sinkronizatzean"
@@ -2851,7 +2851,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "%spartial zerrenda-direktorioa falta da."
@@ -3020,35 +3020,35 @@ msgstr "Tamaina ez dator bat"
msgid "Invalid file format"
msgstr "Eragiketa baliogabea: %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3056,12 +3056,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3070,12 +3070,12 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3113,50 +3113,41 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)"
msgid "Vendor block %s contains no fingerprint"
msgstr "%s saltzaile blokeak ez du egiaztapen markarik"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"%s CD-ROM muntatze puntua erabiltzen\n"
-"CD-ROM-a muntatzen\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Egiaztatzen... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Gordetako Etiketa: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM Desmuntatzen...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "%s CD-ROM muntatze puntua erabiltzen\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "CD-ROM-a desmuntatzen\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Diska itxaroten...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "CD-ROM-a muntatzen...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Egiaztatzen... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Gordetako Etiketa: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM Desmuntatzen...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Indize fitxategien bila diska arakatzen...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3165,22 +3156,22 @@ msgstr ""
"%zu pakete indize, %zu jatorri indize %zu itzulpen indize eta %zu sinadura "
"aurkitu dira\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Aurkitutako Etiketa: '%s' \n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Hau ez baliozko izen bat, froga berriro.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3189,15 +3180,15 @@ msgstr ""
"Diskaren izen:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Pakete zerrendak kopiatzen..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Jatorri zerrenda berria idazten\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Diskoarentzako jatorri sarrerak:\n"
@@ -3481,6 +3472,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "%s CD-ROM muntatze puntua erabiltzen\n"
+#~ "CD-ROM-a muntatzen\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
diff --git a/po/fi.po b/po/fi.po
index c0efe6487..8d8400609 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -157,7 +157,7 @@ msgstr " Paketin tunnistenumero: "
msgid " Version table:"
msgstr " Versiotaulukko:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -254,12 +254,12 @@ msgstr "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Aseta levy asemaan ja paina Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Toista tämä lopuille rompuille kasassasi."
@@ -735,12 +735,12 @@ msgstr "Levyä ei löydy"
msgid "File not found"
msgstr "Tiedostoa ei löydy"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Komento stat ei toiminut"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
@@ -1004,7 +1004,7 @@ msgstr ""
"Seuraavia allekirjoituksia ei voinut varmentaa koska julkista avainta ei ole "
"saatavilla:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1326,108 +1326,108 @@ msgstr "Asennetaanko nämä paketit ilman todennusta?"
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Asennettu]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "mutta %s on asennettu"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "mutta %s on merkitty asennettavaksi"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "mutta ei ole asennuskelpoinen"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "mutta on näennäispaketti"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "mutta ei ole asennettu"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "mutta ei ole merkitty asennettavaksi"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " tai"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Seuraavat UUDET paketit asennetaan:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Seuraavat paketit POISTETAAN:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Nämä paketit on jätetty odottamaan:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Nämä paketit päivitetään:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Nämä paketit VARHENNETAAN:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Seuraavat pysytetyt paketit muutetaan:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (syynä %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1435,27 +1435,27 @@ msgstr ""
"VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n"
"Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu päivitetty, %lu uutta asennusta, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu uudelleen asennettua, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu varhennettua, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
@@ -1464,7 +1464,7 @@ msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[K/e]"
@@ -1472,21 +1472,21 @@ msgstr "[K/e]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "K"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -1654,7 +1654,7 @@ msgstr "Tiedostoa %s ei voitu avata"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "IPC-putken luominen aliprosessiin ei onnistunut"
@@ -2014,47 +2014,47 @@ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2"
msgid "Malformed override %s line %llu #3"
msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Tuntematon pakkausalgoritmi \"%s\""
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "FILE* luominen ei onnistunut"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "fork ei onnistunut"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Compress-lapsiprosessi"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
@@ -2189,12 +2189,12 @@ msgstr "Korvautuksen kaksoislisäys %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Asetustiedoston kaksoiskappale %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Tiedoston %s kirjoittaminen ei onnistunut"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Tiedoston %s sulkeminen ei onnistunut"
@@ -2571,22 +2571,22 @@ msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
msgid "write, still have %llu to write but couldn't"
msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Pulmia tiedoston sulkemisessa"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Pulmia tehtäessä tiedostolle sync"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Pulmia tehtäessä tiedostolle unlink"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Pulmia tehtäessä tiedostolle sync"
@@ -2840,7 +2840,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Luettelokansio %spartial puuttuu."
@@ -3011,35 +3011,35 @@ msgstr "Koko ei täsmää"
msgid "Invalid file format"
msgstr "Virheellinen toiminto %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3047,12 +3047,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3061,12 +3061,12 @@ msgstr ""
"En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
"tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3104,50 +3104,41 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
msgid "Vendor block %s contains no fingerprint"
msgstr "Toimittajan lohkosta %s puuttuu sormenjälki"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Käytetään rompun liitoskohtaa %s\n"
-"Liitetään romppu\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Tunnistetaan... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Tallennettu nimio: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Irrotetaan romppu...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Käytetään rompun liitoskohtaa %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Irrotetaan romppu\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Odotetaan levyä...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Liitetään romppu...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Tunnistetaan... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Tallennettu nimio: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Irrotetaan romppu...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Etsitään levyltä hakemistotiedostoja...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3156,22 +3147,22 @@ msgstr ""
"Hakemistoja löytyi: Asennuspakettien %zu, lähdekoodipakettien %zu, "
"käännösten %zu ja allekirjoituksia löytyi %zu\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Löytyi nimiö: \"%s\"\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3180,15 +3171,15 @@ msgstr ""
"Tämä levy on: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopioidaan pakettiluetteloita..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Kirjoitetaan uusi lähdeluettelo\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
@@ -3473,6 +3464,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Käytetään rompun liitoskohtaa %s\n"
+#~ "Liitetään romppu\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
diff --git a/po/fr.po b/po/fr.po
index 6740d57e9..68ef07aa9 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -156,7 +156,7 @@ msgstr " Épinglage de paquet : "
msgid " Version table:"
msgstr " Table de version :"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -260,12 +260,12 @@ msgid "Please insert a Disc in the drive and press enter"
msgstr ""
"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Impossible de monter « %s » sur « %s »"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
"Veuillez répéter cette opération pour tous les disques de votre jeu de "
@@ -799,12 +799,12 @@ msgstr "Disque non trouvé."
msgid "File not found"
msgstr "Fichier non trouvé"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Impossible de statuer"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Impossible de modifier l'heure "
@@ -1075,7 +1075,7 @@ msgstr ""
"Les signatures suivantes n'ont pas pu être vérifiées car la clé publique "
"n'est pas disponible :\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Les fichiers vides ne peuvent être des archives valables"
@@ -1409,108 +1409,108 @@ msgstr "Faut-il installer ces paquets sans vérification ?"
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de récupérer %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Installé]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "mais %s est installé"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "mais %s devra être installé"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "mais il n'est pas installable"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "mais c'est un paquet virtuel"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "mais il n'est pas installé"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "mais ne sera pas installé"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Les NOUVEAUX paquets suivants seront installés :"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Les paquets suivants seront ENLEVÉS :"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Les paquets suivants ont été conservés :"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Les paquets suivants seront mis à jour :"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Les paquets retenus suivants seront changés :"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (en raison de %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1519,27 +1519,27 @@ msgstr ""
"Vous NE devez PAS faire ceci, à moins de savoir exactement ce\n"
"que vous êtes en train de faire."
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu mis à jour, %lu nouvellement installés, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu réinstallés, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu remis à une version inférieure, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu à enlever et %lu non mis à jour.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu partiellement installés ou enlevés.\n"
@@ -1548,7 +1548,7 @@ msgstr "%lu partiellement installés ou enlevés.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[O/n]"
@@ -1556,21 +1556,21 @@ msgstr "[O/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[o/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "O"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -1744,7 +1744,7 @@ msgstr "Pas d'entrée trouvée dans le fichier de miroir « %s »."
msgid "[Mirror: %s]"
msgstr "[Miroir : %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Impossible de créer le tube IPC sur le sous-processus"
@@ -2105,47 +2105,47 @@ msgstr "Entrée « override » %s mal formée %llu n° 2"
msgid "Malformed override %s line %llu #3"
msgstr "Entrée « override » %s mal formée %llu n° 3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Algorithme de compression « %s » inconnu"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "La sortie compressée %s a besoin d'un ensemble de compression"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Impossible de créer FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Échec du fork"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Fils compressé"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Erreur interne, impossible de créer %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Échec d'entrée/sortie du sous-processus sur le fichier"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Impossible de lire lors du calcul de la somme MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problème en déliant %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Impossible de changer le nom %s en %s"
@@ -2283,12 +2283,12 @@ msgstr "Addition double d'une déviation %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Fichier de configuration en double %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Erreur d'écriture du fichier %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Échec de clôture du fichier %s"
@@ -2682,22 +2682,22 @@ msgstr "lu(s), %llu restant à lire, mais rien n'est disponible"
msgid "write, still have %llu to write but couldn't"
msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problème de fermeture du fichier %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problème de renommage du fichier %s en %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problème de suppression du lien %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problème de synchronisation du fichier"
@@ -2970,7 +2970,7 @@ msgstr ""
"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
"« garder en l'état »."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Le répertoire %spartial pour les listes n'existe pas."
@@ -3159,7 +3159,7 @@ msgstr "Taille incohérente"
msgid "Invalid file format"
msgstr "L'opération %s n'est pas valable"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3168,18 +3168,18 @@ msgstr ""
"Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : "
" ligne non valable dans sources.list ou fichier corrompu"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
"Impossible de trouver la comme de contrôle de « %s » dans le fichier Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3188,12 +3188,12 @@ msgstr ""
"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
"à jour depuis ce dépôt ne s'effectueront pas."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3204,12 +3204,12 @@ msgstr ""
"GPG : %s : %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erreur de GPG : %s : %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3218,14 +3218,14 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même (absence d'architecture)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Impossible de trouver une source de téléchargement de la version « %s » de "
"« %s »"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3263,50 +3263,41 @@ msgstr "Entrée « Date » non valable dans le fichier Release %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Utilisation du point de montage %s pour le cédérom\n"
-"Montage du cédérom\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identification..."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Étiquette stockée : %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Démontage du cédérom...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Utilisation du point de montage %s pour le cédérom\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Démontage du cédérom\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Attente du disque...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Montage du cédérom...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identification..."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Étiquette stockée : %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Démontage du cédérom...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Examen du disque à la recherche de fichiers d'index...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3315,7 +3306,7 @@ msgstr ""
"%zu index de paquets trouvés, %zu index de sources, %zu index de traductions "
"et %zu signatures\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3323,16 +3314,16 @@ msgstr ""
"Aucun fichier de paquets trouvé. Ceci n'est peut-être pas un disque Debian "
"ou bien l'architecture est-elle incorrecte."
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Étiquette « %s » trouvée\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Ce nom n'est pas valable, veuillez recommencer.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3341,15 +3332,15 @@ msgstr ""
"Ce disque s'appelle :\n"
"« %s »\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Copie des listes de paquets..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Écriture de la nouvelle liste de sources\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Les entrées de listes de sources pour ce disque sont :\n"
@@ -3660,6 +3651,13 @@ msgid "Not locked"
msgstr "Non verrouillé"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Utilisation du point de montage %s pour le cédérom\n"
+#~ "Montage du cédérom\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/gl.po b/po/gl.po
index fc10b5552..70aa59a65 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -161,7 +161,7 @@ msgstr " Inmobilizado: "
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-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -259,12 +259,12 @@ msgstr "Forneza un nome para este disco, como «Debian 5.0.3 Disco 1»"
msgid "Please insert a Disc in the drive and press enter"
msgstr "Insira un disco na unidade e prema Intro"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Produciuse un fallo ao montar «%s» en «%s»"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repita este proceso para o resto de CD do seu conxunto."
@@ -758,12 +758,12 @@ msgstr "Non se atopou o disco"
msgid "File not found"
msgstr "Non se atopou o ficheiro"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Non foi posíbel determinar o estado"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Non foi posíbel estabelecer a hora de modificación"
@@ -1029,7 +1029,7 @@ msgstr ""
"Non se puideron verificar as seguintes sinaturas porque a chave pública non "
"está dispoñíbel:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
@@ -1358,108 +1358,108 @@ msgstr "Instalar estes paquetes sen verificación?"
msgid "Failed to fetch %s %s\n"
msgstr "Non foi posíbel obter %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "mais %s está instalado"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "mais vaise instalar %s"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "mais non é instalábel"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "mais é un paquete virtual"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "mais non está instalado"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "mais non se vai a instalar"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Vanse RETIRAR os paquetes seguintes:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Consérvanse os seguintes paquetes:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Vanse anovar os paquetes seguintes:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Vanse REVERTER os seguintes paquetes :"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Vanse modificar os paquetes retidos seguintes:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por mor de %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1467,27 +1467,27 @@ msgstr ""
"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu anovados, %lu instalados, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu revertidos, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non instalados ou retirados de todo.\n"
@@ -1496,7 +1496,7 @@ msgstr "%lu non instalados ou retirados de todo.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1504,21 +1504,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Produciuse un erro na compilación da expresión regular - %s"
@@ -1691,7 +1691,7 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»"
msgid "[Mirror: %s]"
msgstr "[Replica: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Non foi posíbel crear a canle IPC ao subproceso"
@@ -2049,47 +2049,47 @@ msgstr "«Override» %s liña %lu incorrecta (2)"
msgid "Malformed override %s line %llu #3"
msgstr "«Override» %s liña %lu incorrecta (3)"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Algoritmo de compresión «%s» descoñecido"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "A saída comprimida %s precisa dun conxunto de compresión"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Non foi posíbel crear o FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Non foi posíbel facer a bifurcación"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Fillo de compresión"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Produciuse un erro interno, non foi posíbel crear %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Produciuse un fallo na E/S do subproceso/ficheiro"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Non foi posíbel ler ao calcular o MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Xurdiu un problema ao desligar %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Non foi posíbel cambiar o nome de %s a %s"
@@ -2226,12 +2226,12 @@ msgstr "Desvío %s -> %s engadido dúas veces"
msgid "Duplicate conf file %s/%s"
msgstr "Ficheiro de configuración %s/%s duplicado"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Non foi posíbel escribir no ficheiro «%s»"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Non foi posíbel pechar o ficheiro %s"
@@ -2620,22 +2620,22 @@ msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
msgid "write, still have %llu to write but couldn't"
msgstr "escritura, aínda hai %lu para escribir pero non se puido"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Produciuse un problema ao pechar o ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Produciuse un problema ao renomear o ficheiro %s a %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Produciuse un problema ao desligar o ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Produciuse un problema ao sincronizar o ficheiro"
@@ -2897,7 +2897,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Non se atopa a lista de directorios %sparcial."
@@ -3073,7 +3073,7 @@ msgstr "Os tamaños non coinciden"
msgid "Invalid file format"
msgstr "Operación incorrecta: %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3082,29 +3082,29 @@ msgstr ""
"Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación "
"(entrada sources.list incorrecta ou ficheiro con formato incorrecto)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
"Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3115,12 +3115,12 @@ msgstr ""
"%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Produciuse un erro de GPG: %s %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3129,12 +3129,12 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falta a arquitectura)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3172,50 +3172,41 @@ msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
msgid "Vendor block %s contains no fingerprint"
msgstr "O bloque de provedor %s non contén unha pegada dixital"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Empregando o punto de montaxe de CD-ROMs %s\n"
-"Montando o CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identificando... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Etiqueta almacenada: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Desmontando o CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Empregando o punto de montaxe de CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Desmontando o CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Agardando polo disco...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Montando o CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identificando... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Etiqueta almacenada: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando o CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Buscando os ficheiros de índices no disco..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3224,7 +3215,7 @@ msgstr ""
"Atopáronse %zu índices de paquetes, %zu índices de orixes, %zu índices de "
"traducións e %zu sinaturas\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3232,16 +3223,16 @@ msgstr ""
"Non é posíbel localizar ningún ficheiro de paquetes. É posíbel que non sexa "
"un disco de Debian ou que a arquitectura sexa incorrecta."
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Atopouse a etiqueta «%s»\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Ese non é un nome correcto, volva tentalo.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3250,15 +3241,15 @@ msgstr ""
"Este disco chámase: \n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Copiando as listas de paquetes..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Escribindo a nova lista de orixes\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "As entradas da lista de orixes deste disco son:\n"
@@ -3572,6 +3563,13 @@ msgid "Not locked"
msgstr "Non está bloqueado"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Empregando o punto de montaxe de CD-ROMs %s\n"
+#~ "Montando o CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/hu.po b/po/hu.po
index da083b8c7..9a8c47b71 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -159,7 +159,7 @@ msgstr " Csomagrögzítés: "
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-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -254,12 +254,12 @@ msgstr "Adja meg a lemez nevét, mint például „Debian 5.0.3 1. lemezâ€"
msgid "Please insert a Disc in the drive and press enter"
msgstr "Helyezzen be egy lemezt a meghajtóba, és nyomja meg az Entert"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "„%s†csatolása a(z) „%s†könyvtárba meghiúsult"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Ismételje meg a folyamatot készlete többi CD-jével is."
@@ -775,12 +775,12 @@ msgstr "A lemez nem található."
msgid "File not found"
msgstr "A fájl nem található"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Nem érhető el"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "A módosítási idő beállítása sikertelen"
@@ -1045,7 +1045,7 @@ msgstr ""
"Az alábbi aláírások nem ellenőrizhetők, mert a nyilvános kulcs nem érhető "
"el:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Az üres fájlok biztosan nem érvényes csomagok"
@@ -1364,108 +1364,108 @@ msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Telepítve]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "de %s van telepítve"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "de csak %s telepíthető"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "de az nem telepíthető"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "de az egy virtuális csomag"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "de az nincs telepítve"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "de az nincs telepítésre megjelölve"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " vagy"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Az alábbi csomagok el lesznek TÃVOLÃTVA:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Az alábbi csomagok vissza lesznek tartva:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Az alábbi csomagok frissítve lesznek:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Az alábbi visszafogott csomagokat cserélem:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s miatt) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1473,27 +1473,27 @@ msgstr ""
"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu frissített, %lu újonnan telepített, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu újratelepítendő, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu visszafejlesztendő, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu eltávolítandó és %lu nem frissített.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
@@ -1502,7 +1502,7 @@ msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[I/n]"
@@ -1510,21 +1510,21 @@ msgstr "[I/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[i/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -1696,7 +1696,7 @@ msgstr "A(z) „%s†tükörfájl nem olvasható"
msgid "[Mirror: %s]"
msgstr "[Tükör: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Nem sikerült IPC-adatcsatornát létrehozni az alfolyamathoz"
@@ -2052,47 +2052,47 @@ msgstr "%s felülbírálás deformált a(z) %llu. sorában #2"
msgid "Malformed override %s line %llu #3"
msgstr "%s felülbírálás deformált a(z) %llu. sorában #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "„%s†tömörítési algoritmus ismeretlen"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Nem sikerült FILE*-ot létrehozni"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Nem sikerült forkolni"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Gyermekfolyamat tömörítése"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Belső hiba, %s létrehozása sikertelen"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "IO az alfolyamathoz/fájlhoz nem sikerült"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Olvasási hiba az MD5 kiszámításakor"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Hiba %s törlésekor"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "„%s†átnevezése sikertelen erre: %s"
@@ -2228,12 +2228,12 @@ msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása"
msgid "Duplicate conf file %s/%s"
msgstr "Dupla %s/%s konfigurációs fájl"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "A(z) %s fájl írása sikertelen"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "A(z) %s fájl bezárása sikertelen"
@@ -2622,22 +2622,22 @@ msgstr "olvasás, még kellene %llu, de már az összes elfogyott"
msgid "write, still have %llu to write but couldn't"
msgstr "írás, még kiírandó %llu, de ez nem lehetséges"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Hiba a(z) %s fájl bezárásakor"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Hiba a(z) %s fájl átnevezésekor erre: %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Hiba a(z) %s fájl törlésekor"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Hiba a fájl szinkronizálásakor"
@@ -2903,7 +2903,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "A(z) %spartial listakönyvtár hiányzik."
@@ -3081,7 +3081,7 @@ msgstr "A méret nem megfelelő"
msgid "Invalid file format"
msgstr "%s érvénytelen művelet"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3090,16 +3090,16 @@ msgstr ""
"A várt „%s†bejegyzés nem található a Release fájlban (Rossz sources.list "
"bejegyzés vagy helytelenül formázott fájl)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nem található a(z) „%s†ellenőrzőösszege a Release fájlban"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3108,12 +3108,12 @@ msgstr ""
"A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló "
"frissítései nem kerülnek alkalmazásra."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3123,12 +3123,12 @@ msgstr ""
"előző indexfájl lesz használva. GPG hiba: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hiba: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3137,12 +3137,12 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nem található forrás a(z) „%2$s†„%1$s†verziójának letöltéséhez"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3179,50 +3179,41 @@ msgstr "Érvénytelen „Date†bejegyzés a(z) %s Release fájlban"
msgid "Vendor block %s contains no fingerprint"
msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"%s CD-ROM csatolási pont használata\n"
-"CD-ROM csatolása\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Azonosítás... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Tárolt címke: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM leválasztása...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "%s CD-ROM csatolási pont használata\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "CD-ROM leválasztása\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Várakozás a lemezre...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "CD-ROM csatolása...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Azonosítás... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Tárolt címke: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM leválasztása...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Indexfájlok keresése a lemezen...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3231,7 +3222,7 @@ msgstr ""
"%zu csomagindex, %zu forrásindex, %zu fordításindex és %zu aláírás "
"megtalálva\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3239,16 +3230,16 @@ msgstr ""
"Nem találhatók csomagfájlok, lehet hogy ez nem Debian lemez, vagy nem "
"megfelelő az architektúra?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Talált címke: „%sâ€\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "A név érvénytelen, próbálja újra.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3257,15 +3248,15 @@ msgstr ""
"A lemez neve: \n"
"„%sâ€\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Csomaglisták másolása..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Új forráslista írása\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n"
@@ -3567,6 +3558,13 @@ msgid "Not locked"
msgstr "Nincs zárolva"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "%s CD-ROM csatolási pont használata\n"
+#~ "CD-ROM csatolása\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/it.po b/po/it.po
index 94d28a51e..2b3ece7f4 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -159,7 +159,7 @@ msgstr " Gancio del pacchetto: "
msgid " Version table:"
msgstr " Tabella versione:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -262,12 +262,12 @@ msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Inserire un disco nell'unità e premere Invio"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Mount di \"%s\" su \"%s\" non riuscito"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Ripetere questo processo per il resto dei CD."
@@ -788,12 +788,12 @@ msgstr "Disco non trovato"
msgid "File not found"
msgstr "File non trovato"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Esecuzione di stat non riuscita"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Impostazione della data di modifica non riuscita"
@@ -1063,7 +1063,7 @@ msgstr ""
"Le seguenti firme non sono state verificate perché la chiave pubblica non è "
"disponibile:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "File vuoti non possono essere archivi validi"
@@ -1392,108 +1392,108 @@ msgstr "Installare questi pacchetti senza verificarli?"
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile recuperare %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Installato]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ma la versione %s è installata"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ma la versione %s sta per essere installata"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ma non è installabile"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ma è un pacchetto virtuale"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ma non è installato"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ma non sta per essere installato"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " oppure"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "I seguenti pacchetti NUOVI saranno installati:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "I seguenti pacchetti saranno RIMOSSI:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "I seguenti pacchetti saranno aggiornati:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "I seguenti pacchetti saranno RETROCESSI:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (a causa di %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1502,27 +1502,27 @@ msgstr ""
"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
"si sta facendo."
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aggiornati, %lu installati, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstallati, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu retrocessi, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu non completamente installati o rimossi.\n"
@@ -1531,7 +1531,7 @@ msgstr "%lu non completamente installati o rimossi.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1539,21 +1539,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione dell'espressione regolare - %s"
@@ -1726,7 +1726,7 @@ msgstr "Nessuna voce trovata nel file mirror \"%s\""
msgid "[Mirror: %s]"
msgstr "[Mirror: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita"
@@ -2088,47 +2088,47 @@ msgstr "Override %s riga %llu malformato #2"
msgid "Malformed override %s line %llu #3"
msgstr "Override %s riga %llu malformato #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Algoritmo di compressione \"%s\" sconosciuto"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "L'output compresso %s necessita di un insieme di compressione"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Creazione di FILE* non riuscita"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Fork non riuscita"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Sottoprocesso compresso"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Errore interno, creazione di %s non riuscita"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "I/O al sottoprocesso/file non riuscito"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Lettura durante l'elaborazione MD5 non riuscita"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problema nell'unlink di %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Rinomina di %s in %s non riuscita"
@@ -2262,12 +2262,12 @@ msgstr "Doppia aggiunta di deviazione %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "File di configurazione duplicato %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Scrittura del file %s non riuscita"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Chiusura del file %s non riuscita"
@@ -2663,22 +2663,22 @@ msgstr "lettura, ancora %llu da leggere, ma non è stato trovato nulla"
msgid "write, still have %llu to write but couldn't"
msgstr "scrittura, ancora %llu da scrivere, ma non è possibile"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Si è verificato un problema nel chiudere il file %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Si è verificato un problema nel rinominare il file %s in %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Si è verificato un problema nel sincronizzare il file"
@@ -2950,7 +2950,7 @@ msgstr ""
"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
# (ndt) sarebbe da controllare meglio assieme a quella dopo
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Manca la directory di liste %spartial."
@@ -3131,7 +3131,7 @@ msgstr "Le dimensioni non corrispondono"
msgid "Invalid file format"
msgstr "Operazione %s non valida"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3140,17 +3140,17 @@ msgstr ""
"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
"errata o file danneggiato)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3159,12 +3159,12 @@ msgstr ""
"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
"questo repository non verranno applicati."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3174,12 +3174,12 @@ msgstr ""
"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Errore GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3188,14 +3188,14 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\""
# (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3233,50 +3233,41 @@ msgstr "Voce \"Date\" nel file Release %s non valida"
msgid "Vendor block %s contains no fingerprint"
msgstr "Il blocco vendor %s non contiene impronte"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Viene usato il punto di mount del CD-ROM %s\n"
-"Montaggio CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identificazione... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Etichette archiviate: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Smontaggio CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Viene usato il punto di mount del CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Smontaggio CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "In attesa del disco...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Montaggio CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identificazione... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Etichette archiviate: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Smontaggio CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Analisi del disco per file indice...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3285,7 +3276,7 @@ msgstr ""
"Trovati %zu indici di pacchetto, %zu indici di sorgente, %zu indici di "
"traduzione e %zu firme\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3293,16 +3284,16 @@ msgstr ""
"Impossibile trovare alcun file di pacchetto. Questo potrebbe non essere un "
"disco Debian o potrebbe essere l'architettura errata."
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Trovata l'etichetta \"%s\"\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Questo non è un nome valido, riprovare.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3311,15 +3302,15 @@ msgstr ""
"Questo disco è chiamato: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Copia elenco pacchetti..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Scrittura nuovo elenco sorgenti\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
@@ -3634,6 +3625,13 @@ msgid "Not locked"
msgstr "Non bloccato"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Viene usato il punto di mount del CD-ROM %s\n"
+#~ "Montaggio CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 2440aa449..e30393043 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -156,7 +156,7 @@ msgstr " パッケージ Pin: "
msgid " Version table:"
msgstr " ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ†ãƒ¼ãƒ–ル:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -254,12 +254,12 @@ msgstr "ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ã«ã€'Debian 5.0.3 Disk 1' ã®ã‚ˆã†ãªåå‰ã‚’付ã
msgid "Please insert a Disc in the drive and press enter"
msgstr "ディスクをドライブã«å…¥ã‚Œã¦ Enter キーを押ã—ã¦ãã ã•ã„"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "'%s' ã‚’ '%s' ã«ãƒžã‚¦ãƒ³ãƒˆã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
"ã‚ãªãŸã®æŒã£ã¦ã„ã‚‹ CD セットã®æ®‹ã‚Šå…¨éƒ¨ã«ã€ã“ã®æ‰‹é †ã‚’ç¹°ã‚Šè¿”ã—ã¦ãã ã•ã„。"
@@ -778,12 +778,12 @@ msgstr "ディスクãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
msgid "File not found"
msgstr "ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "状態ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "変更時刻ã®è¨­å®šã«å¤±æ•—ã—ã¾ã—ãŸ"
@@ -1046,7 +1046,7 @@ msgid ""
"available:\n"
msgstr "公開éµã‚’利用ã§ããªã„ãŸã‚ã€ä»¥ä¸‹ã®ç½²åã¯æ¤œè¨¼ã§ãã¾ã›ã‚“ã§ã—ãŸ:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "空ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯æœ‰åŠ¹ãªã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã¨èªã‚られã¾ã›ã‚“"
@@ -1361,108 +1361,108 @@ msgstr "検証ãªã—ã«ã“れらã®ãƒ‘ッケージをインストールã—ã¾ã™
msgid "Failed to fetch %s %s\n"
msgstr "%s ã®å–å¾—ã«å¤±æ•—ã—ã¾ã—㟠%s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [インストール済ã¿]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [インストール済ã¿]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [インストール済ã¿]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [インストール済ã¿]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "以下ã®ãƒ‘ッケージã«ã¯æº€ãŸã›ãªã„ä¾å­˜é–¢ä¿‚ãŒã‚ã‚Šã¾ã™:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ã—ã‹ã—ã€%s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã™"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ã—ã‹ã—ã€%s ã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã‚ˆã†ã¨ã—ã¦ã„ã¾ã™"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ã—ã‹ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ã—ã‹ã—ã€ã“ã‚Œã¯ä»®æƒ³ãƒ‘ッケージã§ã™"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ã—ã‹ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ã—ã‹ã—ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã‚ˆã†ã¨ã—ã¦ã„ã¾ã›ã‚“"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " ã¾ãŸã¯"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "以下ã®ãƒ‘ッケージãŒæ–°ãŸã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "以下ã®ãƒ‘ッケージã¯ã€Œå‰Šé™¤ã€ã•ã‚Œã¾ã™:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "以下ã®ãƒ‘ッケージã¯ä¿ç•™ã•ã‚Œã¾ã™:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "以下ã®ãƒ‘ッケージã¯ã‚¢ãƒƒãƒ—グレードã•ã‚Œã¾ã™:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "以下ã®ãƒ‘ッケージã¯ã€Œãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã€ã•ã‚Œã¾ã™:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "以下ã®å¤‰æ›´ç¦æ­¢ãƒ‘ッケージã¯å¤‰æ›´ã•ã‚Œã¾ã™:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s ã®ãŸã‚) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1470,27 +1470,27 @@ msgstr ""
"警告: 以下ã®ä¸å¯æ¬ ãƒ‘ッケージãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚\n"
"何をã—よã†ã¨ã—ã¦ã„ã‚‹ã‹æœ¬å½“ã«ã‚ã‹ã£ã¦ã„ãªã„å ´åˆã¯ã€å®Ÿè¡Œã—ã¦ã¯ã„ã‘ã¾ã›ã‚“!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "アップグレード: %lu 個ã€æ–°è¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«: %lu 個ã€"
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "å†ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«: %lu 個ã€"
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "ダウングレード: %lu 個ã€"
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "削除: %lu 個ã€ä¿ç•™: %lu 個。\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個ã®ãƒ‘ッケージãŒå®Œå…¨ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¾ãŸã¯å‰Šé™¤ã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
@@ -1499,7 +1499,7 @@ msgstr "%lu 個ã®ãƒ‘ッケージãŒå®Œå…¨ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¾ãŸã¯å‰Šé™¤ã
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1507,21 +1507,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "æ­£è¦è¡¨ç¾ã®å±•é–‹ã‚¨ãƒ©ãƒ¼ - %s"
@@ -1694,7 +1694,7 @@ msgstr "ミラーファイル '%s' ã®ã‚¨ãƒ³ãƒˆãƒªãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
msgid "[Mirror: %s]"
msgstr "[ミラー: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "å­ãƒ—ロセスã¸ã® IPC パイプã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ"
@@ -2047,47 +2047,47 @@ msgstr "ä¸æ­£ãª override %s %llu 行目 #2"
msgid "Malformed override %s line %llu #3"
msgstr "ä¸æ­£ãª override %s %llu 行目 #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "'%s' ã¯æœªçŸ¥ã®åœ§ç¸®ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ ã§ã™"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "圧縮出力 %s ã«ã¯åœ§ç¸®ã‚»ãƒƒãƒˆãŒå¿…è¦ã§ã™"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "FILE* ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "fork ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "圧縮å­ãƒ—ロセス"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "内部エラーã€%s ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "å­ãƒ—ロセス/ファイルã¸ã® IO ãŒå¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "MD5 ã®è¨ˆç®—中ã«èª­ã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "%s ã®ãƒªãƒ³ã‚¯è§£é™¤ã§å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s ã‚’ %s ã«åå‰å¤‰æ›´ã§ãã¾ã›ã‚“ã§ã—ãŸ"
@@ -2221,12 +2221,12 @@ msgstr "%s -> %s ã® diversion ãŒäºŒé‡ã«è¿½åŠ ã•ã‚Œã¦ã„ã¾ã™"
msgid "Duplicate conf file %s/%s"
msgstr "設定ファイル %s/%s ãŒé‡è¤‡ã—ã¦ã„ã¾ã™"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "ファイル %s ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "%s ã®ã‚¯ãƒ­ãƒ¼ã‚ºã«å¤±æ•—ã—ã¾ã—ãŸ"
@@ -2610,22 +2610,22 @@ msgstr "読ã¿è¾¼ã¿ãŒ %llu 残ã£ã¦ã„ã‚‹ã¯ãšã§ã™ãŒã€ä½•ã‚‚残ã£ã¦ã„
msgid "write, still have %llu to write but couldn't"
msgstr "ã‚㨠%llu 書ã込む必è¦ãŒã‚ã‚Šã¾ã™ãŒã€æ›¸ã込むã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "ファイル %s ã®ã‚¯ãƒ­ãƒ¼ã‚ºä¸­ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "%s ã‹ã‚‰ %s ã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«å変更中ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "ファイル %s ã®å‰Šé™¤ä¸­ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "ファイルã®åŒæœŸä¸­ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
@@ -2886,7 +2886,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "å•é¡Œã‚’解決ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。壊れãŸå¤‰æ›´ç¦æ­¢ãƒ‘ッケージãŒã‚ã‚Šã¾ã™ã€‚"
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "リストディレクトリ %spartial ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
@@ -3065,7 +3065,7 @@ msgstr "サイズãŒé©åˆã—ã¾ã›ã‚“"
msgid "Invalid file format"
msgstr "ä¸æ­£ãªæ“作 %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3074,16 +3074,16 @@ msgstr ""
"期待ã•ã‚Œã‚‹ã‚¨ãƒ³ãƒˆãƒª '%s' ㌠Release ファイル内ã«è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ (誤ã£ãŸ "
"sources.list エントリã‹ã€å£Šã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release ファイル中㮠'%s' ã®ãƒãƒƒã‚·ãƒ¥ã‚µãƒ ã‚’見ã¤ã‘られã¾ã›ã‚“"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下ã®éµ ID ã«å¯¾ã—ã¦åˆ©ç”¨å¯èƒ½ãªå…¬é–‹éµãŒã‚ã‚Šã¾ã›ã‚“:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3092,14 +3092,14 @@ msgstr ""
"%s ã® Release ファイルã¯æœŸé™åˆ‡ã‚Œ (%s 以æ¥ç„¡åŠ¹) ã§ã™ã€‚ã“ã®ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®æ›´æ–°"
"物ã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“。"
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
"ディストリビューションãŒç«¶åˆã—ã¦ã„ã¾ã™: %s (%s を期待ã—ã¦ã„ãŸã®ã« %s ã‚’å–å¾—ã—"
"ã¾ã—ãŸ)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3109,12 +3109,12 @@ msgstr ""
"ファイルãŒä½¿ã‚ã‚Œã¾ã™ã€‚GPG エラー: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG エラー: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3123,12 +3123,12 @@ msgstr ""
"パッケージ %s ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ä½ç½®ã‚’特定ã§ãã¾ã›ã‚“。ãŠãらãã“ã®ãƒ‘ッケージを手動"
"ã§ä¿®æ­£ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ (存在ã—ãªã„アーキテクãƒãƒ£ã®ãŸã‚)。"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "'%2$s' ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ '%1$s' をダウンロードã™ã‚‹ã‚½ãƒ¼ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3166,50 +3166,41 @@ msgstr "Release ファイル %s ã«ç„¡åŠ¹ãª 'Date' エントリãŒã‚ã‚Šã¾ã™"
msgid "Vendor block %s contains no fingerprint"
msgstr "ベンダブロック %s ã¯éµæŒ‡ç´‹ã‚’å«ã‚“ã§ã„ã¾ã›ã‚“"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"CD-ROM マウントãƒã‚¤ãƒ³ãƒˆ %s を使用ã—ã¾ã™\n"
-"CD-ROM をマウントã—ã¦ã„ã¾ã™\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "確èªã—ã¦ã„ã¾ã™.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "æ ¼ç´ã•ã‚ŒãŸãƒ©ãƒ™ãƒ«: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM をアンマウントã—ã¦ã„ã¾ã™ ...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "CD-ROM マウントãƒã‚¤ãƒ³ãƒˆ %s を使用ã—ã¾ã™\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "CD-ROM をアンマウントã—ã¦ã„ã¾ã™\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "ディスクを待ã£ã¦ã„ã¾ã™ ...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "CD-ROM をマウントã—ã¦ã„ã¾ã™ ...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "確èªã—ã¦ã„ã¾ã™.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "æ ¼ç´ã•ã‚ŒãŸãƒ©ãƒ™ãƒ«: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM をアンマウントã—ã¦ã„ã¾ã™ ...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "ディスクã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’走査ã—ã¦ã„ã¾ã™ ..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3218,7 +3209,7 @@ msgstr ""
"%zu ã®ãƒ‘ッケージインデックスã€%zu ã®ã‚½ãƒ¼ã‚¹ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã€%zu ã®ç¿»è¨³ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯"
"スã€%zu ã®ç½²åを見ã¤ã‘ã¾ã—ãŸ\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3226,16 +3217,16 @@ msgstr ""
"パッケージファイルをé…ç½®ã§ãã¾ã›ã‚“。Debian ã®ãƒ‡ã‚£ã‚¹ã‚¯ã§ã¯ãªã„ã‹ã€èª¤ã£ãŸã‚¢ãƒ¼ã‚­"
"テクãƒãƒ£ã§ã¯ãªã„ã§ã—ょã†ã‹?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "ラベル '%s' を見ã¤ã‘ã¾ã—ãŸ\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "ã“ã‚Œã¯æœ‰åŠ¹ãªåå‰ã§ã¯ã‚ã‚Šã¾ã›ã‚“。å†è©¦è¡Œã—ã¦ãã ã•ã„。\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3244,15 +3235,15 @@ msgstr ""
"ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ã¯ä»¥ä¸‹ã®ã‚ˆã†ã«å‘¼ã°ã‚Œã¾ã™: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "パッケージリストをコピーã—ã¦ã„ã¾ã™ ..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "æ–°ã—ã„ソースリストを書ã込んã§ã„ã¾ã™\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ã®ã‚½ãƒ¼ã‚¹ãƒªã‚¹ãƒˆã®ã‚¨ãƒ³ãƒˆãƒª:\n"
@@ -3558,6 +3549,13 @@ msgid "Not locked"
msgstr "ロックã•ã‚Œã¦ã„ã¾ã›ã‚“"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "CD-ROM マウントãƒã‚¤ãƒ³ãƒˆ %s を使用ã—ã¾ã™\n"
+#~ "CD-ROM をマウントã—ã¦ã„ã¾ã™\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/km.po b/po/km.po
index f1d9bee64..60090a304 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -161,7 +161,7 @@ msgstr " ážáŸ’ទាស់​កញ្ចប់ ៖ "
msgid " Version table:"
msgstr " ážáž¶ážšáž¶áž„​កំណែ ៖"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -259,12 +259,12 @@ msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ážáž¶ážŸâ€‹
msgid "Please insert a Disc in the drive and press enter"
msgstr "សូម​បញ្ចូល​ážáž¶ážŸâ€‹áž€áŸ’នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ប្ážáž¼ážšâ€‹ážˆáŸ’មោះ %s ទៅ %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "ធ្វើដំណើរការ​នáŸáŸ‡â€‹áž˜áŸ’ážáž„​ទៀážâ€‹ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។"
@@ -733,12 +733,12 @@ msgstr "រក​ážáž¶ážŸáž˜áž·â€‹áž“​ឃើញ​ ។"
msgid "File not found"
msgstr "រកឯកសារ​មិន​ឃើញ​"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការážáŸ’លែង"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "បរាជáŸáž™áž€áŸ’នុងការកំណážáŸ‹â€‹áž–áŸáž›ážœáŸáž›áž¶â€‹áž€áž¶ážšáž€áŸ‚ប្រែ​"
@@ -997,7 +997,7 @@ msgid ""
"available:\n"
msgstr "áž ážáŸ’ážáž›áŸážáž¶â€‹ážáž¶áž„ក្រោម​មិន​អាចផ្ទៀងផ្ទាážáŸ‹áž”ាន​ទáŸâ€‹ ព្រោះកូនសោ​សាធារណៈមិន​អាច​ប្រើ​បាន​ ៖\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1308,108 +1308,108 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនáŸáŸ‡ ​ដោáž
msgid "Failed to fetch %s %s\n"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [បានដំឡើង​]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "កញ្ចប់​ážáž¶áž„ក្រោម​មាន​ភាពអាស្រáŸáž™â€‹ážŠáŸ‚ល​ážáž»ážŸâ€‹áž‚្នា ៖"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ប៉ុន្ážáŸ‚​ %s ážáŸ’រូវ​បាន​ដំឡើង​"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ប៉ុន្ážáŸ‚​ %s នឹង​ážáŸ’រូវ​បាន​ដំឡើ​ង"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ប៉ុន្ážáŸ‚​​វា​មិន​អាច​ដំឡើង​បាន​ទáŸâ€‹"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ប៉ុន្ážáŸ‚​​វា​ជា​កញ្ចប់​និម្មិážâ€‹"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ប៉ុន្ážáŸ‚​វា​មិន​បាន​ដំឡើង​ទáŸâ€‹"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ប៉ុន្ážáŸ‚ វា​នឹង​មិន​ážáŸ’រូវ​បាន​ដំឡើង​ទáŸ"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " ឬ"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "កញ្ចប់​ážáŸ’មី​ážáž¶áž„ក្រោម​នឹង​ážáŸ’រូវ​បាន​ដំឡើង​ ៖"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "កញ្ចប់​ážáž¶áž„ក្រោម​នឹងážáŸ’រូវ​បាន​យកចáŸáž‰Â áŸ–"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "​កញ្ចប់​ážáž¶áž„​ក្រោម​ážáŸ’រូវ​បាន​យក​ážáŸ’រឡប់​មក​វិញ ៖"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "កញ្ចប់​ážáž¶áž„ក្រោម​នឹង​​ážáŸ’រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "កញ្ចប់​ážáž¶áž„ក្រោម​នឹង​​ážáŸ’រូវ​បាន​បន្ទាប ៖"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "កញ្ចប់​រង់ចាំ​ážáž¶áž„ក្រោម​នឹង​ážáŸ’រូវ​​បានផ្លាស់​​ប្ážáž¼ážšâ€‹Â áŸ–"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (ដោយ​សារážáŸ‚​ %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1417,27 +1417,27 @@ msgstr ""
"ព្រមាន​ ៖ កញ្ចប់ដែល​ចាំបាច់​ážáž¶áž„ក្រោម​នឹង​ážáŸ’រូវ​បាន​យកចáŸáž‰Â áŸ”\n"
"ការយកចáŸáž‰â€‹áž“áŸáŸ‡â€‹áž˜áž·áž“​ážáŸ’រូវ​បានធ្វើ​ទáŸâ€‹áž›áž»áŸ‡ážáŸ’រា​ážáŸ‚​អ្នកដឹង​ážáž¶â€‹â€‹áž¢áŸ’នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu ážáŸ’រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ážáŸ’រូវ​បានដំឡើង​ážáŸ’មី "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ážáŸ’រូវ​បាន​ដំឡើង​ឡើង​វិញ "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu ​ážáŸ’រូវបានបន្ទាប់ "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu ដែលážáŸ’រូវ​យក​ចáŸáž‰â€‹ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចáŸáž‰áž”ានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
@@ -1446,7 +1446,7 @@ msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចáŸáž‰áž”
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1454,21 +1454,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -1636,7 +1636,7 @@ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡáž
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​បង្កើážâ€‹áž”ំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​"
@@ -1991,47 +1991,47 @@ msgstr "Malformed បដិសáŸáž’ %s បន្ទាážáŸ‹â€‹ %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Malformed បដិសáŸáž’ %s បន្ទាážáŸ‹â€‹ %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រាយ​ការបង្ហាប់​ '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ážáŸ’រូវ​ការ​កំណážáŸ‹â€‹áž€áž¶ážšáž”ង្ហាប់​"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​បង្កើážâ€‹ FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុងការ​ដាក់ជា​ពីរផ្នែក​"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "បង្ហាប់កូន"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "កំហុស​ážáž¶áž„ក្នុង​ បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​បង្កើážâ€‹ %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជáŸáž™â€‹"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "បាន​បរាជáŸáž™â€‹áž€áŸ’នុង​ការអាន​ នៅពáŸáž›â€‹áž‚ណនា MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់ážáŸ†ážŽ %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុង​ការ​ប្ážáž¼ážšâ€‹ážˆáŸ’មោះ %s ទៅ %s"
@@ -2166,12 +2166,12 @@ msgstr "ការបន្ážáŸ‚ម​ស្ទួន នៃការបង្áž
msgid "Duplicate conf file %s/%s"
msgstr "ឯកសារ​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ស្ទួន​ %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​សរសáŸážšâ€‹áž¯áž€ážŸáž¶ážš %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "បរាជáŸáž™â€‹áž€áŸ’នុងការ​បិទឯកសារ %s"
@@ -2549,22 +2549,22 @@ msgstr "អាន​, នៅážáŸ‚​មាន %lu ដើម្បី​អាáž
msgid "write, still have %llu to write but couldn't"
msgstr "សរសáŸážšâ€‹, នៅážáŸ‚មាន​ %lu ដើម្បី​សរសáŸážšâ€‹ ប៉ុន្ážáŸ‚​មិន​អាច​"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់ážáŸ†ážŽâ€‹áž¯áž€ážŸáž¶ážš"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
@@ -2819,7 +2819,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "មិន​អាច​កែ​បញ្ហាបានទáŸáŸ អ្កបានទុក​កញ្ចប់​ដែល​ážáž¼áž… ។។"
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "រាយបញ្ជី​ážážâ€‹ %spartial គឺ​បាážáŸ‹áž”ង់​ ។"
@@ -2990,35 +2990,35 @@ msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
msgid "Invalid file format"
msgstr "ប្រážáž·áž”ážáŸ’ážáž·áž€áž¶ážšâ€‹áž˜áž·áž“​ážáŸ’រឹមážáŸ’រូវ​ %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ážáž¶áž„ក្រោម​នáŸáŸ‡áž‘áŸÂ áŸ–\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3026,12 +3026,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3040,12 +3040,12 @@ msgstr ""
"ážáŸ’ញុំ​មិន​អាច​រកទីážáž¶áŸ†áž„​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទáŸÂ áŸ” ​មាន​នáŸáž™â€‹ážáž¶â€‹áž¢áŸ’នក​ážáŸ’រូវការ​ជួសជុល​កញ្ចប់​នáŸáŸ‡â€‹ážŠáŸ„យ​ដៃ ។ "
"(ដោយសារ​​បាážáŸ‹â€‹ážŸáŸ’ážáž¶áž”ážáŸ’យកម្ម)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3081,73 +3081,64 @@ msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1
msgid "Vendor block %s contains no fingerprint"
msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្ážáž·ážâ€‹áž˜áŸ’រាម​ដៃ"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n"
-"កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "កំពុង​ធ្វើអážáŸ’ážážŸáž‰áŸ’ញាណនា​.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "បានទុក​ស្លាក ៖ %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ áž‘áŸ..."
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម​\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "កំពុង​រង់ចាំឌីស​...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "កំពុង​ម៉ោន​ ស៊ីឌី​-រ៉ូម​...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "កំពុង​ធ្វើអážáŸ’ážážŸáž‰áŸ’ញាណនា​.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "បានទុក​ស្លាក ៖ %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ áž‘áŸ..."
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "កំពុង​ស្កáŸáž“​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, fuzzy, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i លិបិក្រម​ប្រភព%i áž“áž·áž„ áž ážáŸ’ážáž›áŸážáž¶ %i \n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, fuzzy, c-format
msgid "Found label '%s'\n"
msgstr "បានទុក​ស្លាក ៖ %s \n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "នោះមិនមែនជាឈ្មោះážáŸ’រឹមážáŸ’រូវទ០សូមព្យាយាម​ម្ដងទៀážÂ áŸ”\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3156,15 +3147,15 @@ msgstr ""
"ឌីស​នáŸáŸ‡â€‹ážáŸ’រូវ​បាន​ហៅ​ ៖ \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "កំពុងសរសáŸážšâ€‹áž”ញ្ជី​ប្រភព​ážáŸ’មី\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "ធាážáž»áž”ញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នáŸáŸ‡áž‚ឺ ៖\n"
@@ -3446,6 +3437,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n"
+#~ "កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
diff --git a/po/ko.po b/po/ko.po
index bdfc73b70..2ee50c339 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -152,7 +152,7 @@ msgstr " 패키지 핀: "
msgid " Version table:"
msgstr " 버전 í…Œì´ë¸”:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -250,12 +250,12 @@ msgstr "ì´ ë””ìŠ¤í¬ì˜ ì´ë¦„ì„ ì •í•˜ì‹­ì‹œì˜¤ (예: 'Debian 5.0.3 Disk 1')"
msgid "Please insert a Disc in the drive and press enter"
msgstr "ë“œë¼ì´ë¸Œì— 디스í¬ë¥¼ 넣고 Enter를 누르십시오"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "%s 파ì¼ì˜ ì´ë¦„ì„ %s(으)ë¡œ ë°”ê¾¸ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "현재 ê°–ê³  있는 다른 CDì—ë„ ì´ ê³¼ì •ì„ ë°˜ë³µí•˜ì‹­ì‹œì˜¤."
@@ -740,12 +740,12 @@ msgstr "디스í¬ê°€ 없습니다."
msgid "File not found"
msgstr "파ì¼ì´ 없습니다"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "íŒŒì¼ ì •ë³´ë¥¼ ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "íŒŒì¼ ë³€ê²½ ì‹œê°ì„ ì„¤ì •í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
@@ -1005,7 +1005,7 @@ msgid ""
"available:\n"
msgstr "ë‹¤ìŒ ì„œëª…ë“¤ì€ ê³µê°œí‚¤ê°€ 없기 ë•Œë¬¸ì— ì¸ì¦í•  수 없습니다:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1319,108 +1319,108 @@ msgstr "확ì¸í•˜ì§€ ì•Šê³  패키지를 설치하시겠습니까?"
msgid "Failed to fetch %s %s\n"
msgstr "%s 파ì¼ì„ ë°›ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [설치함]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "ë‹¤ìŒ íŒ¨í‚¤ì§€ì˜ ì˜ì¡´ì„±ì´ 맞지 않습니다:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "하지만 %s 패키지를 설치했습니다"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "하지만 %s 패키지를 설치할 것입니다"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "하지만 설치할 수 없습니다"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "하지만 ê°€ìƒ íŒ¨í‚¤ì§€ìž…ë‹ˆë‹¤"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "하지만 설치하지 않았습니다"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "하지만 %s 패키지를 설치하지 ì•Šì„ ê²ƒìž…ë‹ˆë‹¤"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " 혹ì€"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "ë‹¤ìŒ ìƒˆ 패키지를 설치할 것입니다:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "ë‹¤ìŒ íŒ¨í‚¤ì§€ë¥¼ 지울 것입니다:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "ë‹¤ìŒ íŒ¨í‚¤ì§€ë¥¼ 과거 버전으로 유지합니다:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "ë‹¤ìŒ íŒ¨í‚¤ì§€ë¥¼ 업그레ì´ë“œí•  것입니다:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "ë‹¤ìŒ íŒ¨í‚¤ì§€ë¥¼ 다운그레ì´ë“œí•  것입니다:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "ê³ ì •ë˜ì—ˆë˜ ë‹¤ìŒ íŒ¨í‚¤ì§€ë¥¼ 바꿀 것입니다:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s때문ì—) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1428,27 +1428,27 @@ msgstr ""
"경고: ê¼­ 필요한 ë‹¤ìŒ íŒ¨í‚¤ì§€ë¥¼ 지우게 ë©ë‹ˆë‹¤.\n"
"무슨 ì¼ì„ 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%luê°œ 업그레ì´ë“œ, %luê°œ 새로 설치, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu개 다시 설치, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%luê°œ 업그레ì´ë“œ, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%luê°œ 제거 ë° %luê°œ 업그레ì´ë“œ 안 함.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
@@ -1457,7 +1457,7 @@ msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[Y/n]"
@@ -1465,21 +1465,21 @@ msgstr "[Y/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[y/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "ì •ê·œì‹ ì»´íŒŒì¼ ì˜¤ë¥˜ - %s"
@@ -1651,7 +1651,7 @@ msgstr "'%s' 미러 파ì¼ì´ 없습니다 "
msgid "[Mirror: %s]"
msgstr "[미러 사ì´íŠ¸: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "하위 í”„ë¡œì„¸ìŠ¤ì— ëŒ€í•œ IPC 파ì´í”„를 ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
@@ -2006,47 +2006,47 @@ msgstr "override %sì˜ %lu번 줄 #2ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
msgid "Malformed override %s line %llu #3"
msgstr "override %sì˜ %lu번 줄 #3ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "'%s' 압축 ì•Œê³ ë¦¬ì¦˜ì„ ì•Œ 수 없습니다"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "ì••ì¶•ëœ ì¶œë ¥ë¬¼ %sì—는 압축 세트가 필요합니다"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "FILE*를 ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "forkí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "압축 하위 프로세스"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "내부 오류, %s ë§Œë“œëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "하위 프로세스/파ì¼ì— ìž…ì¶œë ¥í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "MD5를 계산하는 ë™ì•ˆ ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "%sì˜ ë§í¬ë¥¼ í•´ì œí•˜ëŠ”ë° ë¬¸ì œê°€ 있습니다"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s 파ì¼ì˜ ì´ë¦„ì„ %s(으)ë¡œ ë°”ê¾¸ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
@@ -2182,12 +2182,12 @@ msgstr "ì „í™˜ëœ íŒŒì¼ì„ ë‘ ë²ˆ 추가합니다 (%s -> %s)"
msgid "Duplicate conf file %s/%s"
msgstr "%s/%s 설정 파ì¼ì´ 중복ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "%s 파ì¼ì„ ì“°ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "%s 파ì¼ì„ ë‹«ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤"
@@ -2565,22 +2565,22 @@ msgstr "%luë§Œí¼ ë” ì½ì–´ì•¼ 하지만 ë” ì´ìƒ ì½ì„ ë°ì´í„°ê°€ 없습ë
msgid "write, still have %llu to write but couldn't"
msgstr "%luë§Œí¼ ë” ì¨ì•¼ 하지만 ë” ì´ìƒ 쓸 수 없습니다"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "%s 파ì¼ì„ ë‹«ëŠ”ë° ë¬¸ì œê°€ 있습니다"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "%s 파ì¼ì„ %s(으)ë¡œ ì´ë¦„ì„ ë°”ê¾¸ëŠ”ë° ë¬¸ì œê°€ 있습니다"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "%s 파ì¼ì„ ì‚­ì œí•˜ëŠ”ë° ë¬¸ì œê°€ 있습니다"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "파ì¼ì„ ë™ê¸°í™”í•˜ëŠ”ë° ë¬¸ì œê°€ 있습니다"
@@ -2838,7 +2838,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "문제를 ë°”ë¡œìž¡ì„ ìˆ˜ 없습니다. ë§ê°€ì§„ ê³ ì • 패키지가 있습니다."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "ëª©ë¡ ë””ë ‰í„°ë¦¬ %spartialì´ ë¹ ì¡ŒìŠµë‹ˆë‹¤."
@@ -3008,35 +3008,35 @@ msgstr "í¬ê¸°ê°€ 맞지 않습니다"
msgid "Invalid file format"
msgstr "ìž˜ëª»ëœ ìž‘ì—… %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release íŒŒì¼ %s 파ì¼ì„ 파싱할 수 없습니다"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "ë‹¤ìŒ í‚¤ IDì˜ ê³µê°œí‚¤ê°€ 없습니다:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "ë°°í¬íŒ 충ëŒ: %s (예ìƒê°’ %s, 실제값 %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3046,12 +3046,12 @@ msgstr ""
"ì˜ˆì „ì˜ ì¸ë±ìŠ¤ 파ì¼ì„ 사용합니다. GPG 오류: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 오류: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3060,12 +3060,12 @@ msgstr ""
"%s íŒ¨í‚¤ì§€ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ íŒ¨í‚¤ì§€ë¥¼ ê³ ì³ì•¼ í•  ìˆ˜ë„ ìžˆìŠµ"
"니다. (아키í…ì³ê°€ 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3102,57 +3102,48 @@ msgstr "Release íŒŒì¼ %sì— 'Date' í•­ëª©ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤"
msgid "Vendor block %s contains no fingerprint"
msgstr "ë²¤ë” ë¸”ëŸ­ %sì˜ í•‘ê±°í”„ë¦°íŠ¸ê°€ 없습니다"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"CD-ROM 마운트 위치로 %s 사용\n"
-"CD-ROMì„ ë§ˆìš´íŠ¸í•˜ëŠ” 중입니다\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "알아보는 중입니다.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "ì €ìž¥ëœ ë ˆì´ë¸”: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROMì„ ë§ˆìš´íŠ¸ 해제하는 중입니다...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "CD-ROM 마운트 위치 %s 사용\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "CD-ROM 마운트 해제하는 중입니다\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "디스í¬ë¥¼ 기다리는 중입니다...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "CD-ROM 마운트하는 중입니다...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "알아보는 중입니다.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "ì €ìž¥ëœ ë ˆì´ë¸”: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROMì„ ë§ˆìš´íŠ¸ 해제하는 중입니다...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "디스í¬ì—ì„œ ìƒ‰ì¸ íŒŒì¼ì„ 찾는 중입니다...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr "패키지 ìƒ‰ì¸ %zuê°œ, 소스 ìƒ‰ì¸ %zuê°œ, 번역 ìƒ‰ì¸ %zuê°œ, 서명 %zuê°œ 발견\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3160,16 +3151,16 @@ msgstr ""
"패키지 파ì¼ì´ í•˜ë‚˜ë„ ì—†ìŠµë‹ˆë‹¤. ì•„ë§ˆë„ ë°ë¹„안 디스í¬ê°€ 아니거나 아키í…처가 잘"
"ëª»ëœ ê²ƒ 같습니다?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "ë ˆì´ë¸” 발견: %s \n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "올바른 ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤. 다시 ì‹œë„하십시오.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3178,15 +3169,15 @@ msgstr ""
"ì´ ë””ìŠ¤í¬ëŠ” 다ìŒê³¼ 같습니다: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "패키지 목ë¡ì„ 복사하는 중입니다..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "새 소스 리스트를 쓰는 중입니다\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "ì´ ë””ìŠ¤í¬ì˜ 소스 리스트 í•­ëª©ì€ ë‹¤ìŒê³¼ 같습니다:\n"
@@ -3481,6 +3472,13 @@ msgid "Not locked"
msgstr "잠기지 ì•ŠìŒ"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "CD-ROM 마운트 위치로 %s 사용\n"
+#~ "CD-ROMì„ ë§ˆìš´íŠ¸í•˜ëŠ” 중입니다\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/ku.po b/po/ku.po
index 27b91ba0e..31f7720f0 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -160,7 +160,7 @@ msgstr " Destika pakêtê:"
msgid " Version table:"
msgstr " Tabloya guhertoyan:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -222,12 +222,12 @@ msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk
msgid "Please insert a Disc in the drive and press enter"
msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Anîna %s %s biserneket\n"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -653,13 +653,13 @@ msgstr "Dîsk nehate dîtin."
msgid "File not found"
msgstr "Pel nehate dîtin"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
#, fuzzy
msgid "Failed to stat"
msgstr "%s venebû"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr ""
@@ -918,7 +918,7 @@ msgid ""
"available:\n"
msgstr ""
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1217,134 +1217,134 @@ msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Sazkirî]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "lê %s sazkirî ye"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "lê %s dê were sazkirin"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "lê sazkirina wê ne gengaz e"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "lê paketeke farazî ye"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "lê ne sazkirî ye"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "lê dê neyê sazkirin"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " û"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Ev pakêt dê werine RAKIRIN:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr ""
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Ev paket dê werine bilindkirin:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr ""
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (ji ber %s)"
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ji nû ve sazkirî,"
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu hatine nizmkirin."
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
@@ -1353,7 +1353,7 @@ msgstr ""
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
#, fuzzy
msgid "[Y/n]"
msgstr "[E/n]"
@@ -1362,21 +1362,21 @@ msgstr "[E/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "E"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1540,7 +1540,7 @@ msgstr "Nikarî pelê %s veke"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
@@ -1841,47 +1841,47 @@ msgstr ""
msgid "Malformed override %s line %llu #3"
msgstr ""
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr ""
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr ""
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr ""
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr ""
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr ""
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr ""
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr ""
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr ""
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr ""
@@ -2010,12 +2010,12 @@ msgstr ""
msgid "Duplicate conf file %s/%s"
msgstr ""
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Nivîsîna pelê %s biserneket"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Girtina pelê %s biserneket"
@@ -2394,22 +2394,22 @@ msgstr ""
msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Di girtina pelî de pirsgirêkek derket"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Di girtina pelî de pirsgirêkek derket"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Di girtina pelî de pirsgirêkek derket"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr ""
@@ -2657,7 +2657,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Peldanka '%s' kêm e"
@@ -2825,35 +2825,35 @@ msgstr "Mezinahî li hev nayên"
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2861,24 +2861,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2914,70 +2914,63 @@ msgstr "Pakêt nehate dîtin %s"
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:576
+#: apt-pkg/cdrom.cc:575
#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
+msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
+#: apt-pkg/cdrom.cc:583
+msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
+#: apt-pkg/cdrom.cc:588
+msgid "Waiting for disc...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:642
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
+#: apt-pkg/cdrom.cc:597
+msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:660
-msgid "Unmounting CD-ROM\n"
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:665
-msgid "Waiting for disc...\n"
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:674
-msgid "Mounting CD-ROM...\n"
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Etîketa '%s' hatiye dîtin\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -2986,15 +2979,15 @@ msgstr ""
"Navê dîskê: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Lîsteyên pakêtan tên jibergirtin..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index b6d55782a..02bd75fbb 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -158,7 +158,7 @@ msgstr " Paketo susiejimai: "
msgid " Version table:"
msgstr " Versijų lentelė:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -219,12 +219,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Prašome įdėti diską į įrenginį ir paspausti Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Nepavyko pervadinti %s į %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Pakartokite Å¡itÄ… procesÄ… su kitais CD savo rinkinyje."
@@ -657,12 +657,12 @@ msgstr "Diskas nerastas."
msgid "File not found"
msgstr "Failas nerastas"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr ""
@@ -919,7 +919,7 @@ msgid ""
"available:\n"
msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1229,108 +1229,108 @@ msgstr "Įdiegti šiuos paketus be patvirtinimo?"
msgid "Failed to fetch %s %s\n"
msgstr "Nepavyko parsiųsti %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Įdiegtas]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Šie paketai turi neįdiegtų priklausomybių:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "bet %s yra įdiegtas"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "bet %s bus įdiegtas"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "taÄiau jis negali bÅ«ti įdiegtas"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "bet tai yra virtualus paketas"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "bet jis nėra įdiegtas"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "bet jis nebus įdiegtas"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " arba"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Bus įdiegti šie NAUJI paketai:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Bus PAÅ ALINTI Å¡ie paketai:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Šių paketų atnaujinimas sulaikomas:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Bus atnaujinti Å¡ie paketai:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Bus PAKEISTI SENESNIAIS Å¡ie paketai:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Bus pakeisti Å¡ie sulaikyti paketai:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dÄ—l %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1338,27 +1338,27 @@ msgstr ""
"Įspėjimas: Šie būtini paketai bus pašalinti.\n"
"Tai NETURĖTŲ būti daroma, kol tiksliai nežinote ką darote!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu atnaujinti, %lu naujai įdiegti, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu įdiegti iš naujo, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu pasendinti, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
@@ -1367,7 +1367,7 @@ msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[T/n]"
@@ -1375,21 +1375,21 @@ msgstr "[T/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[t/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "T"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -1558,7 +1558,7 @@ msgstr "Nepavyko atverti failo %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Nepavyko subprocesui sukurti IPC gijos"
@@ -1923,47 +1923,47 @@ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Nežinomas suspaudimo algoritmas „%s“"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Suspaustai iÅ¡vesÄiai %s reikia suspaudimo rinkinio"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Nepavyko sukurti FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr ""
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr ""
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "VidinÄ— klaida, nepavyko sukurti %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Nepavyko Nusk/Įraš į subprocesą/failą"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Skaitymo klaida skaiÄiuojant MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Nepavyko pervadinti %s į %s"
@@ -2100,12 +2100,12 @@ msgstr ""
msgid "Duplicate conf file %s/%s"
msgstr ""
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr ""
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr ""
@@ -2483,22 +2483,22 @@ msgstr ""
msgid "write, still have %llu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Klaida užveriant failą"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Klaida sinchronizuojant failÄ…"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Klaida užveriant failą"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Klaida sinchronizuojant failÄ…"
@@ -2746,7 +2746,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Trūksta aplanko „%s“"
@@ -2917,35 +2917,35 @@ msgstr "Neatitinka dydžiai"
msgid "Invalid file format"
msgstr "Klaidingas veiksmas %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2953,24 +2953,24 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG klaida: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3006,70 +3006,63 @@ msgstr "Nepavyko atverti DB failo %s: %s"
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identifikuojama.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Atjungiamas CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Naudojama CD-ROM prijungimo vieta %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Atjungiamas CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Laukiama disko...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Prijungiamas CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identifikuojama.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Atjungiamas CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Rasta žymė „%s“\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3078,15 +3071,15 @@ msgstr ""
"Å io disko pavadinimas: \n"
"„%s“\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopijuojami paketų sąrašai..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Rašomas naujas šaltinių sąrašas\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr ""
diff --git a/po/mr.po b/po/mr.po
index d10cf403c..0714bc52d 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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 "
@@ -155,7 +155,7 @@ msgstr "पॅकेज (पिन):"
msgid " Version table:"
msgstr "आवृतà¥à¤¤à¥€ कोषà¥à¤Ÿà¤•:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -253,12 +253,12 @@ msgstr "या तबकडीला कृपया नाव दà¥à¤¯à¤¾ जà
msgid "Please insert a Disc in the drive and press enter"
msgstr "कृपया तबकडी डà¥à¤°à¤¾à¤ˆà¤µà¥à¤¹à¤®à¤§à¥à¤¯à¥‡ ठेवून à¤à¤‚टर दाबा"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "%s ला पà¥à¤¨à¤°à¥à¤¨à¤¾à¤®à¤¾à¤‚कन %s करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥ "
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "तà¥à¤®à¤šà¥à¤¯à¤¾ संचामधील सरà¥à¤µ सीडीजसाठी याच कृतीची पà¥à¤¨à¤°à¤¾à¤µà¥ƒà¤¤à¥à¤¤à¥€ करा(हीच कृती करा)"
@@ -729,12 +729,12 @@ msgstr "डिसà¥à¤• सापडत नाही"
msgid "File not found"
msgstr "फाईल सापडली नाही"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "सà¥à¤Ÿà¥…ट करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "बदलणà¥à¤¯à¤¾à¤šà¤¾ वेळ निशà¥à¤šà¤¿à¤¤ करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
@@ -995,7 +995,7 @@ msgid ""
"available:\n"
msgstr "खालील सहà¥à¤¯à¤¾à¤‚ची खातà¥à¤°à¥€ करता येत नाही कारण सारà¥à¤µà¤œà¤¨à¤¿à¤• कीउपलबà¥à¤§ नाही:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1312,108 +1312,108 @@ msgstr "पडताळून पाहिलà¥à¤¯à¤¾à¤¶à¤¿à¤µà¤¾à¤¯ ही प
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr "[संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ केले]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr "[संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ केले]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr "[संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ केले]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr "[संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ केले]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "खालील पॅकेजेस मधà¥à¤¯à¥‡ नमिळणाऱà¥à¤¯à¤¾ निरà¥à¤­à¤°à¤¤à¤¾/ डिपेनà¥à¤¡à¤¨à¥à¤¸à¥€à¤œ आहेत:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "पण %s संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¾à¤²à¥‡"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "पण %s संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ करायचे आहे"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "पण ते संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ करणà¥à¤¯à¤¾à¤œà¥‹à¤—े नाही"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "पण ते आभासी पॅकेज आहे"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "पण ते संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ केले नाही"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "पण ते संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ होणार नाही"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr "किंवा"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "खालील नविन पॅकेजेस संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ होतील:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "खालील पॅकेजेस परत ठेवली गेली:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "खालील पॅकेजेस पà¥à¤¢à¤¿à¤² आवृतà¥à¤¤à¥€à¤•à¥ƒà¤¤ होतील:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "खालील पॅकेजेस पà¥à¤¢à¤šà¥à¤¯à¤¾ आवृतà¥à¤¤à¥€à¤•à¥ƒà¤¤ होणार नाहीत:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "पà¥à¤¢à¤¿à¤² ठेवलेली पॅकेजेस बदलतील:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (चà¥à¤¯à¤¾ मà¥à¤³à¥‡ %s)"
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1421,27 +1421,27 @@ msgstr ""
"धोकà¥à¤¯à¤¾à¤šà¥€ सूचना:खालील जरूरीची पॅकेजेस कायमची काढून टाकली जातील।\n"
"तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ तà¥à¤®à¥à¤¹à¥€ काय करत आहात हे कळेपरà¥à¤¯à¤‚त असं करता येणार नाही!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu पà¥à¤¢à¥‡ आवृतà¥à¤¤à¥€à¤•à¥ƒà¤¤ केले, %lu नवà¥à¤¯à¤¾à¤¨à¥‡ संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ केले,"
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu पà¥à¤¨à¤°à¥à¤¸à¤‚सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ केले,"
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu मागील आवृतà¥à¤¤à¥€à¤•à¥ƒà¤¤ केले,"
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu कायमचे काढून टाकणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ आणि %lu पà¥à¤¢à¤šà¥à¤¯à¤¾ आवृतà¥à¤¤à¥€à¤•à¥ƒà¤¤ à¤à¤¾à¤²à¥‡à¤²à¥€ नाही.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu संपूरà¥à¤£ संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ किंवा कायमची काढून टाकलेली नाही.\n"
@@ -1450,7 +1450,7 @@ msgstr "%lu संपूरà¥à¤£ संसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ किंवा à¤
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1458,21 +1458,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "होय"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "रिजेकà¥à¤¸ कंपायलेशन तà¥à¤°à¥à¤Ÿà¥€ -%s "
@@ -1640,7 +1640,7 @@ msgstr "%s फाईल उघडता येत नाही"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "उपकà¥à¤°à¤¿à¤¯à¥‡à¤šà¤¾ आयपीसी वाहिनी तयार करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
@@ -1996,47 +1996,47 @@ msgstr "वà¥à¤¯à¤‚गीत/हिडीस दà¥à¤°à¥à¤²à¤•à¥à¤·à¤¿à¤¤ क
msgid "Malformed override %s line %llu #3"
msgstr "वà¥à¤¯à¤‚गीत/हिडीस दà¥à¤°à¥à¤²à¤•à¥à¤·à¤¿à¤¤ केले %s रेषा %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "माहित नसलेली/ले संकà¥à¤·à¥‡à¤ª पदà¥à¤§à¤¤à¥€/अलगोरिथम '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "%s संकलित आऊटपà¥à¤Ÿ/निरà¥à¤—त साठी संकà¥à¤·à¥‡à¤ª संचाची गरज"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "संचिका * तयार करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "नविन पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾(पà¥à¤°à¥‹à¤¸à¥‡à¤¸) निरà¥à¤®à¤¾à¤£ करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "चॉईलà¥à¤¡(पà¥à¤°à¥‹à¤¸à¥‡à¤¸)ला संकलित करा"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "अंतरà¥à¤—त तà¥à¤°à¥à¤Ÿà¥€, %s तयार करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "IO ची उपकà¥à¤°à¤¿à¤¯à¤¾/संचिका असमरà¥à¤¥ "
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "MD5 कामपà¥à¤¯à¥à¤Ÿà¥€à¤‚ग करतांना वाचणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ असमरà¥à¤¥"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "%s दà¥à¤µà¤¾ मोकळा/सà¥à¤Ÿà¤¾ करणà¥à¤¯à¤¾à¤¸ अडचण"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s ला पà¥à¤¨à¤°à¥à¤¨à¤¾à¤®à¤¾à¤‚कन %s करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥ "
@@ -2172,12 +2172,12 @@ msgstr "%s -> %s डायवà¥à¤¹à¤°à¥à¤œà¤¨ दà¥à¤ªà¥à¤ªà¤Ÿ मिळवà
msgid "Duplicate conf file %s/%s"
msgstr "%s/%s संचिरित संचिकाची दà¥à¤¸à¤°à¥€ पà¥à¤°à¤¤/नकà¥à¤•à¤²"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "%s फाईल मधà¥à¤¯à¥‡ लिहिणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "%s फाईल बंद करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥"
@@ -2554,22 +2554,22 @@ msgstr "वाचा, %lu अजूनही वाचणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ à
msgid "write, still have %llu to write but couldn't"
msgstr "लिहा, %lu अजूनही लिहिणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ आहे पण लिहिता येत नाही"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "फाईल बंद करणà¥à¤¯à¤¾à¤¤ अडचण"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "संचिकेची syncing समसà¥à¤¯à¤¾"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "फाईल अनलिंकिंग करणà¥à¤¯à¤¾à¤¤ अडचण"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "संचिकेची syncing समसà¥à¤¯à¤¾"
@@ -2824,7 +2824,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "अडचणी दूर करणà¥à¤¯à¤¾à¤¸ असमरà¥à¤¥, तà¥à¤®à¥à¤¹à¥€ तà¥à¤Ÿà¤²à¥‡à¤²à¥‡ पॅकेज घेतलेले आहे."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "संचयिका यादीत %s पारà¥à¤¶à¤² हरवले आहे."
@@ -2998,35 +2998,35 @@ msgstr "आकार जà¥à¤³à¤¤à¤¨à¤¾à¤¹à¥€"
msgid "Invalid file format"
msgstr "%s अवैध कà¥à¤°à¤¿à¤¯à¤¾"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (1) पॅकेज फाईल पारà¥à¤¸ करणà¥à¤¯à¤¾à¤¤ असमरà¥à¤¥"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "पà¥à¤¢à¥€à¤² कळ ओळखचिनà¥à¤¹à¤¾à¤‚साठी सारà¥à¤µà¤œà¤¨à¤¿à¤• कळ उपलबà¥à¤§ नाही:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3034,12 +3034,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3048,12 +3048,12 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधणà¥à¤¯à¤¾à¤¸ समरà¥à¤¥ नवà¥à¤¹à¤¤à¥‹. याचा अरà¥à¤¥ असाकी तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ हे पॅकेज सà¥à¤µà¤¹à¤¸à¥à¤¤à¥‡ "
"सà¥à¤¥à¤¿à¤°/निशà¥à¤šà¤¿à¤¤ करणà¥à¤¯à¤¾à¤šà¥€ गरज आहे(हरवलेलà¥à¤¯à¤¾ आरà¥à¤šà¤®à¥à¤³à¥‡) "
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3091,50 +3091,41 @@ msgstr "%s (1) पॅकेज फाईल पारà¥à¤¸ करणà¥à¤¯à¤¾à¤
msgid "Vendor block %s contains no fingerprint"
msgstr "विकà¥à¤°à¥‡à¤¤à¤¾ गट %s मधà¥à¤¯à¥‡ बोटाचे ठसे नाहीत"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"सिडी-रॉमचे माउंट सà¥à¤¥à¤¾à¤¨ %s वापरà¥à¤¨\n"
-"सिडी-रॉम माउंट होत आहे\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "ओळखत आहे.."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "गà¥à¤°à¤¹à¤£ केलेले नामदरà¥à¤¶à¤•: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "सिडी-रॉम अनमाउंट होत आहे...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "सिडी-रॉमचे माउंट सà¥à¤¥à¤¾à¤¨ %s वापरà¥à¤¨\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "सिडी-रॉम अनमाउंट करत आहे\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "डिसà¥à¤•/चकती करिता पà¥à¤°à¤¤à¤¿à¤•à¥à¤·à¤¾ करीत आहे...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "सिडी-रॉम माउंट होत आहे...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "ओळखत आहे.."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "गà¥à¤°à¤¹à¤£ केलेले नामदरà¥à¤¶à¤•: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "सिडी-रॉम अनमाउंट होत आहे...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "संचिकाचà¥à¤¯à¤¾ यादी/सूचीसाठी डिसà¥à¤•/चकती बारकाईने तपासत आहे..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3143,22 +3134,22 @@ msgstr ""
"%zu पॅकेजेसची यादी/सूची, %zu सà¥à¤¤à¥à¤°à¥‹à¤¤à¤¾à¤šà¥€ यादी/सूची, %zu भाषांतर यादी/सूची आणि %zu "
"सà¥à¤µà¤¾à¤•à¥à¤·à¤±à¥à¤¯à¤¾/सिगनेचरà¥à¤¸ सापडलà¥à¤¯à¤¾\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "'%s' लेबल सापडले\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "ते सà¥à¤µà¤¿à¤•à¤¾à¤°à¤£à¥à¤¯à¤¾à¤œà¥‹à¤—े/वैध नांव नाही, पà¥à¤¨à¥à¤¹à¤¾ पà¥à¤°à¤¯à¤¤à¥à¤¨ करा.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3167,15 +3158,15 @@ msgstr ""
"हà¥à¤¯à¤¾ डिसà¥à¤•à¤²à¤¾/चकतीला: मà¥à¤¹à¤£à¤¤à¤¾à¤¤\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "पॅकेज सूचींचà¥à¤¯à¤¾ पà¥à¤°à¤¤à¥€ तयार करित आहे..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "नविन सà¥à¤¤à¥à¤°à¥‹à¤¤ सूची लिहित आहे\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "हà¥à¤¯à¤¾ डिसà¥à¤•/चकती करिता सà¥à¤¤à¥à¤°à¥‹à¤¤ सूचीचà¥à¤¯à¤¾ पà¥à¤°à¤µà¥‡à¤¶à¤¿à¤•à¤¾ आहेत: \n"
@@ -3458,6 +3449,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "सिडी-रॉमचे माउंट सà¥à¤¥à¤¾à¤¨ %s वापरà¥à¤¨\n"
+#~ "सिडी-रॉम माउंट होत आहे\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "सूचना, '%s' रिजेकà¥à¤¸ साठी %s ची निवड करत आहे\n"
diff --git a/po/nb.po b/po/nb.po
index a452f57b5..5249ddabc 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -160,7 +160,7 @@ msgstr " Pakke låst til: "
msgid " Version table:"
msgstr " Versjonstabell:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -259,12 +259,12 @@ msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»"
msgid "Please insert a Disc in the drive and press enter"
msgstr "Sett inn en disk i lagringsenheten og trykk Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Klarte ikke montere «%s» på «%s»"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett."
@@ -746,12 +746,12 @@ msgstr "Disk ikke funnet."
msgid "File not found"
msgstr "Fant ikke fila"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Klarte ikke å få status"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Klarte ikke å sette endringstidspunkt"
@@ -1013,7 +1013,7 @@ msgstr ""
"De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen "
"ikke er tilgjengelig:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1333,108 +1333,108 @@ msgstr "Installer disse pakkene uten verifikasjon?"
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke å skaffe %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installeres"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "men lar seg ikke installere"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "men er en virtuell pakke"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "men er ikke installert"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "men skal ikke installeres"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Følgende NYE pakker vil bli installert:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Følgende pakker vil bli FJERNET:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Følgende pakker er holdt tilbake:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Følgende pakker vil bli oppgradert:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Følgende pakker vil bli NEDGRADERT:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Følgende pakker vil bli endret:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (pga. %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1442,27 +1442,27 @@ msgstr ""
"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nylig installerte, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installert på nytt, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
@@ -1471,7 +1471,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1479,21 +1479,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulært uttrykk - %s"
@@ -1665,7 +1665,7 @@ msgstr "Ingen speilfil «%s» funnet"
msgid "[Mirror: %s]"
msgstr "[Speil: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Klarte ikke å opprette IPC-rør til underprosessen"
@@ -2022,47 +2022,47 @@ msgstr "Ugyldig overstyring %s linje %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Ugyldig overstyring %s linje %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Ukjent komprimeringsalgoritme «%s»"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Komprimert utdata %s trenger et komprimeringssett"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Klarte ikke å opprette FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Klarte ikke å forgreine prosess"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Komprimer barneprosess"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Intern feil, klarte ikke å opprette %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Klarte ikke å kommunisere med underprosess/fil"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Klarte ikke å lese under utregning av MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problem ved oppheving av lenken til %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Klarte ikke å endre navnet på %s til %s"
@@ -2198,12 +2198,12 @@ msgstr "Dobbel tillegging av avledning %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Dobbel oppsettsfil %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Klarte ikke å skrive fila %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Klarte ikke å lukke fila %s"
@@ -2584,22 +2584,22 @@ msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
msgid "write, still have %llu to write but couldn't"
msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem ved låsing av fila %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem ved endring av navn på fila %s til %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem ved oppheving av lenke til fila %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problem ved oppdatering av fila"
@@ -2856,7 +2856,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listemappa %spartial mangler."
@@ -3027,36 +3027,36 @@ msgstr "Feil størrelse"
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3066,12 +3066,12 @@ msgstr ""
"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-feil: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3080,12 +3080,12 @@ msgstr ""
"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
"selv (fordi arkitekturen mangler)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3121,50 +3121,41 @@ msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Bruker CD-ROM monteringspunkt %s\n"
-"Monterer CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Indentifiserer.."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Lagret merkelapp: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterer CD-ROM ...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Bruker CD-ROM monteringspunkt %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Avmonterer CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Venter på CD-en...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Monterer CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Indentifiserer.."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Lagret merkelapp: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Avmonterer CD-ROM ...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Leter gjennom CD for indeksfiler..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3173,7 +3164,7 @@ msgstr ""
"Fant %zu pakkeindekser, %zu kildeindekser, %zu oversettelsesindekser og %zu "
"signaturer\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3181,16 +3172,16 @@ msgstr ""
"Klarte ikke finne noen Package-filer. Kanskje dette ikke er en Debian Disc "
"eller du har valgt feil arkitektur?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Fant merkelapp «%s»\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikke et gyldig navn, prøv igjen.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3199,15 +3190,15 @@ msgstr ""
"CD-en er kalt: \n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopierer pakkelister..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Skriver ny kildeliste\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Kildelisteoppføringer for denne CD-en er:\n"
@@ -3509,6 +3500,13 @@ msgid "Not locked"
msgstr "Ikke låst"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Bruker CD-ROM monteringspunkt %s\n"
+#~ "Monterer CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/ne.po b/po/ne.po
index e627077a0..a8fa67496 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -158,7 +158,7 @@ msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ पिन:"
msgid " Version table:"
msgstr " संसà¥à¤•à¤°à¤£ तालिका:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -257,12 +257,12 @@ msgstr "कृपया यो डिसà¥à¤•à¤•à¥‹ लागि नाम उà
msgid "Please insert a Disc in the drive and press enter"
msgstr "कृपया डà¥à¤°à¤¾à¤‡à¤­à¤®à¤¾ डिसà¥à¤• घà¥à¤¸à¤¾à¤‰à¤¨à¥à¤¹à¥‹à¤¸à¥ र इनà¥à¤Ÿà¤° थिचà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr " %s मा %s पà¥à¤¨:नामकरण असफल भयो"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "तपाईà¤à¤•à¥‹ सेटमा बाà¤à¤•à¥€ सि डि हरà¥à¤•à¥‹ लागि यो पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ फेरी गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । "
@@ -731,12 +731,12 @@ msgstr "डिसà¥à¤• फेला परेन ।"
msgid "File not found"
msgstr "फाइल फेला परेन "
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "सà¥à¤¥à¤¿à¤° गरà¥à¤¨ असफल भयो"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "परिमारà¥à¤œà¤¨ समय सेट असफल भयो"
@@ -996,7 +996,7 @@ msgid ""
"available:\n"
msgstr "निमà¥à¤¨ हसà¥à¤¤à¤¾à¤•à¥à¤·à¤°à¤¹à¤°à¥‚ रूजू हà¥à¤¨ सकà¥à¤¦à¥ˆà¤¨ किन भने सारà¥à¤µà¤œà¤¨à¤¿à¤• कà¥à¤žà¥à¤œà¥€ उपलबà¥à¤§ छैन:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1309,108 +1309,108 @@ msgstr "यी पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ रूजू बिना सà¥à¤
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तानà¥à¤¨ असफल भयो\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥à¤²à¥‡ निरà¥à¤­à¤°à¤¤à¤¾à¤¹à¤°à¥‚ भेटेननà¥:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "तर %s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "तर %s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥à¤ªà¤°à¥à¤¯à¥‹"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "तर यो सà¥à¤¥à¤¾à¤ªà¤¨à¤¾à¤¯à¥‹à¤—à¥à¤¯ छैन"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "तर यो अवासà¥à¤¤à¤µà¤¿à¤• पà¥à¤¯à¤¾à¤•à¥‡à¤œ होइन"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "तर यो सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भà¤à¤¨"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "तर यो सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨ गइरहेको छैन"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr "वा"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "निमà¥à¤¨ नयाठपà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ हà¥à¤¨à¥‡à¤›à¤¨à¥:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ हटाइनेछनà¥:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ पछाडि राखिनेछनà¥:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¤à¤° वृदà¥à¤§à¤¿ हà¥à¤¨à¥‡à¤›à¤¨à¥:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "निमà¥à¤¨ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ सà¥à¤¤à¤°à¤•à¤® गरिनेछनà¥:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "निमà¥à¤¨ भइरहेको पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ परिवरà¥à¤¤à¤¨ हà¥à¤¨à¥‡à¤›à¥ˆà¤¨:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s कारणले) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1418,27 +1418,27 @@ msgstr ""
"चेतावनी: निमà¥à¤¨ आवशà¥à¤¯à¤• पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥‚ हटाइनेछनॠ।\n"
"तपाईठके गरिरहेको यकिन नभà¤à¤¸à¤®à¥à¤® यो काम गरिने छैन!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu सà¥à¤¤à¤° वृदà¥à¤§à¤¿ गरियो, %lu नयाठसà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भयो, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu पà¥à¤¨: सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ गरियो, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu सà¥à¤¤à¤° कम गरियो, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu हटाउन र %lu सà¥à¤¤à¤° वृदà¥à¤§à¤¿ गरिà¤à¤¨ ।\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu पूरà¥à¤£à¤°à¥à¤ªà¤²à¥‡ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भà¤à¤¨ र हटाइà¤à¤¨ ।\n"
@@ -1447,7 +1447,7 @@ msgstr "%lu पूरà¥à¤£à¤°à¥à¤ªà¤²à¥‡ सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ भà¤à¤¨ र à
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1455,21 +1455,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "संकलन तà¥à¤°à¥à¤Ÿà¤¿ रिजेकà¥à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ - %s"
@@ -1637,7 +1637,7 @@ msgstr "फाइल %s खोलà¥à¤¨ सकिà¤à¤¨"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "सहायक पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾à¤®à¤¾ IPC पाइप सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ असफल"
@@ -1993,47 +1993,47 @@ msgstr "वैरà¥à¤ªà¥à¤¯ गरिà¤à¤•à¥‹ अधिलेखन %s रà¥
msgid "Malformed override %s line %llu #3"
msgstr "वैरà¥à¤ªà¥à¤¯ गरिà¤à¤•à¥‹ अधिलेखन %s रेखा %lu #३"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "अजà¥à¤žà¤¾à¤¤ सङà¥à¤•à¥à¤šà¤¨ अलà¥à¤—ोरिदà¥à¤® '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "सङà¥à¤•à¥à¤šà¤¨ गरिà¤à¤•à¥‹ निरà¥à¤—ात %s लाई सङà¥à¤•à¥à¤šà¤¨ सेटको आवशà¥à¤¯à¤•à¥à¤¤à¤¾ परà¥à¤¦à¤›"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "FILE* सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ असफल"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "काà¤à¤Ÿà¤¾ गरà¥à¤¨ असफल"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "सङà¥à¤•à¥à¤šà¤¨ शाखा"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "आनà¥à¤¤à¤°à¥€à¤• तà¥à¤°à¥à¤Ÿà¤¿, %s सिरà¥à¤œà¤¨à¤¾ गरà¥à¤¨ असफल"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "सहायक पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾/फाइलमा IO असफल भयो"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "MD5 गणना गरà¥à¤¦à¤¾ पढà¥à¤¨ असफल भयो"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "समसà¥à¤¯à¤¾ अनलिङà¥à¤• भइरहेछ %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr " %s मा %s पà¥à¤¨:नामकरण असफल भयो"
@@ -2168,12 +2168,12 @@ msgstr "मोडको डबल थप %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "नकà¥à¤•à¤²à¥€ कनफिगगरेसन फाइल %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "फाइल %s लेखà¥à¤¨ असफल भयो"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "%s फाइल बनà¥à¤¦ गरà¥à¤¨ असफल भयो"
@@ -2551,22 +2551,22 @@ msgstr "पडà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, अहिले समà¥à¤® %lu पढà¥à
msgid "write, still have %llu to write but couldn't"
msgstr "लेखà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, अहिले समà¥à¤® %lu लेखà¥à¤¨ छ तर सकिदैन "
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "फाइल बनà¥à¤¦ गरà¥à¤¦à¤¾ समसà¥à¤¯à¤¾"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "फाइल गà¥à¤ªà¥à¤¤à¤¿à¤•à¤°à¤£ गरà¥à¤¦à¤¾ समसà¥à¤¯à¤¾"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "फाइल अनलिङà¥à¤• गरà¥à¤¦à¤¾ समसà¥à¤¯à¤¾"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "फाइल गà¥à¤ªà¥à¤¤à¤¿à¤•à¤°à¤£ गरà¥à¤¦à¤¾ समसà¥à¤¯à¤¾"
@@ -2821,7 +2821,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "समसà¥à¤¯à¤¾à¤¹à¤°à¥‚ सà¥à¤§à¤¾à¤°à¥à¤¨ असकà¥à¤·à¤® भयो, तपाईà¤à¤²à¥‡ पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤¹à¤°à¥ भाà¤à¤šà¥à¤¨à¥à¤­à¤¯à¥‹ ।"
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "आंशिक सूचिहरà¥à¤•à¥‹ डाइरेकà¥à¤Ÿà¥à¤°à¥€ %s हराइरहेछ ।"
@@ -2992,35 +2992,35 @@ msgstr "साइज मेल खाà¤à¤¨"
msgid "Invalid file format"
msgstr "अवैध सञà¥à¤šà¤¾à¤²à¤¨ %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइल पद वरà¥à¤£à¤¨ गरà¥à¤¨ असकà¥à¤·à¤® %s (१)"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "निमà¥à¤¨ कà¥à¤žà¥à¤œà¥€ IDs को लागि कà¥à¤¨à¥ˆ सारà¥à¤µà¤œà¤¨à¤¿à¤• कà¥à¤žà¥à¤œà¥€ उपलबà¥à¤§ छैन:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3028,12 +3028,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3042,12 +3042,12 @@ msgstr ""
"%s पà¥à¤¯à¤¾à¤•à¥‡à¤œà¤•à¥‹ लागि मैले फाइल सà¥à¤¥à¤¿à¤¤ गरà¥à¤¨ सकिन । यसको मतलब तपाईà¤à¤²à¥‡ मà¥à¤¯à¤¾à¤¨à¥à¤²à¥à¤²à¥€ यो पà¥à¤¯à¤¾à¤•à¥‡à¤œ "
"निशà¥à¤šà¤¿à¤¤ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । (arch हराà¤à¤°à¤¹à¥‡à¤•à¥‹ कारणले) "
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3083,73 +3083,64 @@ msgstr "पà¥à¤¯à¤¾à¤•à¥‡à¤œ फाइल पद वरà¥à¤£à¤¨ गरà¥à¤¨ à
msgid "Vendor block %s contains no fingerprint"
msgstr "बिकà¥à¤°à¤¤à¤¾ बà¥à¤²à¥à¤• %s ले कà¥à¤¨à¥ˆ औठाछाप समाविषà¥à¤Ÿ गरà¥à¤¦à¥ˆà¤¨"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"सिडी रोम माउनà¥à¤Ÿ विनà¥à¤¦à¥ पà¥à¤°à¤¯à¥‹à¤— गरिदैछ %s\n"
-"सिडी रोम माउनà¥à¤Ÿ गरिदैछ\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "परिचय गराइदैछ.."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "लेबà¥à¤² भणà¥à¤¡à¤¾à¤°à¤£ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥:%s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "सिडी रोम अनमाउनà¥à¤Ÿ गरिदैछ..."
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "सिडी रोम माउनà¥à¤Ÿ विनà¥à¤¦à¥ पà¥à¤°à¤¯à¥‹à¤— गरिदैछ %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "सिडी रोम अनमाउनà¥à¤Ÿ गरिदैछ\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "डिसà¥à¤•à¥‹ लागि परà¥à¤–िदै...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "सिडी रोम माउनà¥à¤Ÿ गरिदै...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "परिचय गराइदैछ.."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "लेबà¥à¤² भणà¥à¤¡à¤¾à¤°à¤£ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥:%s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "सिडी रोम अनमाउनà¥à¤Ÿ गरिदैछ..."
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ फाइलहरà¥à¤•à¥‹ लागि डिसà¥à¤• सà¥à¤•à¥à¤¯à¤¾à¤¨ गरिदैछ...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, fuzzy, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr " %i पà¥à¤¯à¤¾à¤•à¥‡à¤œ अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾à¤¹à¤°à¥‚, %i सà¥à¤°à¥‹à¤¤ अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ र %i हसà¥à¤¤à¤¾à¤•à¥à¤·à¤°à¤¹à¤°à¥‚ फेला परे\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, fuzzy, c-format
msgid "Found label '%s'\n"
msgstr "लेबà¥à¤² भणà¥à¤¡à¤¾à¤°à¤£ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥:%s \n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "तà¥à¤¯à¥‹ वैध नाम होइन, फेरी पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3158,15 +3149,15 @@ msgstr ""
"यो डिसà¥à¤•à¤•à¥‹ नाम:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "पà¥à¤¯à¤•à¥‡à¤œ सूचिहरू पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¥€ गरिदैछ..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "नयाठसà¥à¤°à¥‹à¤¤ सूचि लेखिदैछ\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "यो डिसà¥à¤•à¤•à¥‹ लागि सà¥à¤°à¥‹à¤¤ सूचि पà¥à¤°à¤µà¤¿à¤·à¥à¤Ÿà¤¿à¤¹à¤°à¥‚:\n"
@@ -3449,6 +3440,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "सिडी रोम माउनà¥à¤Ÿ विनà¥à¤¦à¥ पà¥à¤°à¤¯à¥‹à¤— गरिदैछ %s\n"
+#~ "सिडी रोम माउनà¥à¤Ÿ गरिदैछ\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "दà¥à¤°à¤·à¥à¤Ÿà¤¬à¥à¤¯, रिजेकà¥à¤¸ '%s' को लागि %s चयन गरिदैछ\n"
diff --git a/po/nl.po b/po/nl.po
index f9768da25..157f67583 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -158,7 +158,7 @@ msgstr " Pakketpin: "
msgid " Version table:"
msgstr " Versietabel:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -258,12 +258,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Aankoppelen van '%s' op '%s' is mislukt"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set."
@@ -757,12 +757,12 @@ msgstr "Schijf niet gevonden"
msgid "File not found"
msgstr "Bestand niet gevonden"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "stat is mislukt"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Instellen van de aanpassingstijd is mislukt"
@@ -1027,7 +1027,7 @@ msgstr ""
"De volgende ondertekeningen konden niet geverifieerd worden omdat de "
"publieke sleutel niet beschikbaar is:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1353,108 +1353,108 @@ msgstr "Wilt u deze pakketten installeren zonder verificatie?"
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s is mislukt %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Geïnstalleerd]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "maar %s is geïnstalleerd"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "maar %s zal geïnstalleerd worden"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "maar het is niet installeerbaar"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "maar het is een virtueel pakket"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "maar het is niet geïnstalleerd"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "maar het zal niet geïnstalleerd worden"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " of"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "De volgende pakketten zijn achtergehouden:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (vanwege %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1462,27 +1462,27 @@ msgstr ""
"WAARSCHUWING: De volgende essentiële pakketten zullen verwijderd worden.\n"
"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu opnieuw geïnstalleerd, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu gedegradeerd, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
@@ -1491,7 +1491,7 @@ msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1499,21 +1499,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -1685,7 +1685,7 @@ msgstr "Geen spiegelbestand '%s' gevonden "
msgid "[Mirror: %s]"
msgstr "[Spiegelserver: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Aanmaken van IPC-pijp naar subproces is mislukt"
@@ -2048,47 +2048,47 @@ msgstr "Misvormde voorrangsingang %s op regel %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Misvormde voorrangsingang %s op regel %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Onbekend compressie-algoritme '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Gecomprimeerde uitvoer %s vereist een compressieset"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Aanmaken van FILE* is mislukt"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Vorken van proces is mislukt"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Comprimeer kind"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Interne fout, aanmaken van %s is mislukt"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "IO naar subproces/bestand is mislukt"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Probleem bij het ontlinken van %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Hernoemen van %s naar %s is mislukt"
@@ -2224,12 +2224,12 @@ msgstr "Dubbele toevoeging van de omleiding %s->%s"
msgid "Duplicate conf file %s/%s"
msgstr "Dubbel configuratiebestand %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Wegschrijven van bestand %s is mislukt"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Sluiten van bestand %s is mislukt"
@@ -2618,22 +2618,22 @@ msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
msgid "write, still have %llu to write but couldn't"
msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Probleem bij het afsluiten van het bestand %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Probleem bij het hernoemen van '%s' naar '%s'"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Probleem bij het ontlinken van het bestand %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Probleem bij het synchroniseren van het bestand"
@@ -2893,7 +2893,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Lijstmap %spartial is afwezig."
@@ -3074,36 +3074,36 @@ msgstr "Grootte komt niet overeen"
msgid "Invalid file format"
msgstr "Ongeldige operatie %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kon Release-bestand %s niet ontleden"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3114,12 +3114,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fout: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3128,12 +3128,12 @@ msgstr ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
"dit pakket handmatig moet repareren (wegens missende architectuur)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3171,50 +3171,41 @@ msgstr "Geen 'Date'-vermelding in Release-bestand %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Verkopersblok %s bevat geen vingerafdruk"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n"
-"CD wordt aangekoppeld\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identificatie..."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Opgeslagen label: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD wordt afgekoppeld...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "CD wordt losgekoppeld\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Er wordt gewacht op de schijf...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "CD wordt aangekoppeld...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identificatie..."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Opgeslagen label: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD wordt afgekoppeld...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Er wordt gescand voor indexbestanden...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3223,7 +3214,7 @@ msgstr ""
"Er zijn %zu pakket-indexen, %zu bron-indexen, %zu vertalingsindexen, en %zu "
"handtekeningen gevonden\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3231,16 +3222,16 @@ msgstr ""
"Kan geen Package-bestanden vinden. Is dit mogelijk geen Debian schijf, of de "
"verkeerde architectuur?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Label '%s' gevonden\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3249,15 +3240,15 @@ msgstr ""
"De schijf heet:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Pakketlijsten worden gekopieerd..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Nieuwe bronlijst wordt weggeschreven\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
@@ -3568,6 +3559,13 @@ msgid "Not locked"
msgstr "Niet vergrendeld"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n"
+#~ "CD wordt aangekoppeld\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/nn.po b/po/nn.po
index 0ef1b50ec..37c373e18 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -160,7 +160,7 @@ msgstr " Pakke spikra til: "
msgid " Version table:"
msgstr " Versjonstabell:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -261,12 +261,12 @@ msgstr ""
" «%s»\n"
"i stasjonen «%s» og trykk Enter.\n"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Klarte ikkje endra namnet på %s til %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -740,12 +740,12 @@ msgstr "Fann ikkje fila"
msgid "File not found"
msgstr "Fann ikkje fila"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Klarte ikkje få status"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Klarte ikkje setja endringstidspunkt"
@@ -1005,7 +1005,7 @@ msgid ""
"available:\n"
msgstr ""
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1318,108 +1318,108 @@ msgstr "Installer desse pakkane utan verifikasjon?"
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Installert]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installerast"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "men lèt seg ikkje installera"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "men er ein virtuell pakke"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "men er ikkje installert"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "men skal ikkje installerast"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Dei følgjande NYE pakkane vil verta installerte:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Dei følgjande pakkane vil verta FJERNA:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Dei følgjande pakkane er haldne tilbake:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Dei følgjande pakkane vil verta oppgraderte:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (fordi %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -1428,27 +1428,27 @@ msgstr ""
"ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n"
"Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nyleg installerte, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installerte på nytt, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
@@ -1457,7 +1457,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1465,21 +1465,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -1648,7 +1648,7 @@ msgstr "Klarte ikkje opna fila %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Klarte ikkje oppretta IPC-røyr til underprosessen"
@@ -1999,47 +1999,47 @@ msgstr "Misforma overstyring %s linje %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Misforma overstyring %s linje %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Ukjend komprimeringsalgoritme %s"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Komprimert utdata %s treng eit komprimeringssett"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Klarte ikkje oppretta FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Klarte ikkje gafla"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Komprimer barn"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Intern feil, klarte ikkje oppretta %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Klarte ikkje kommunisera med underprosess/fil"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Klarte ikkje lesa under utrekning av MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problem ved oppheving av lenkje til %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Klarte ikkje endra namnet på %s til %s"
@@ -2174,12 +2174,12 @@ msgstr "Dobbel tilleggjing av avleiing %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Dobbel oppsettsfil %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, fuzzy, c-format
msgid "Failed to write file %s"
msgstr "Klarte ikkje skriva fila %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Klarte ikkje lukka fila %s"
@@ -2557,22 +2557,22 @@ msgstr "lese, har framleis %lu att å lesa, men ingen att"
msgid "write, still have %llu to write but couldn't"
msgstr "skrive, har framleis %lu att å skrive, men klarte ikkje"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Problem ved låsing av fila"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem ved synkronisering av fila"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem ved oppheving av lenkje til fila"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problem ved synkronisering av fila"
@@ -2829,7 +2829,7 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Listekatalogen %spartial manglar."
@@ -3004,35 +3004,35 @@ msgstr "Feil storleik"
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3040,12 +3040,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3054,12 +3054,12 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3096,73 +3096,64 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
msgid "Vendor block %s contains no fingerprint"
msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Brukar monteringspunktet %s for CD-ROM\n"
-"Monterer CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identifiserer ... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Lagra etikett: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterer CD-ROM ..."
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Brukar monteringspunktet %s for CD-ROM\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Avmonterer CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Ventar på disk ...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Monterer CD-ROM ...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identifiserer ... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Lagra etikett: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "Avmonterer CD-ROM ..."
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Leitar etter indeksfiler på disken ...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, fuzzy, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, fuzzy, c-format
msgid "Found label '%s'\n"
msgstr "Lagra etikett: %s \n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Det er ikkje eit gyldig namn, prøv igjen.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3171,15 +3162,15 @@ msgstr ""
"Disken vert kalla: \n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopierer pakkelister ..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Skriv ny kjeldeliste\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Kjeldelisteoppføringar for denne disken er:\n"
@@ -3462,6 +3453,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Brukar monteringspunktet %s for CD-ROM\n"
+#~ "Monterer CD-ROM\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Merk, vel %s i staden for regex «%s»\n"
diff --git a/po/pl.po b/po/pl.po
index a1e4c2aec..79e0a0470 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -162,7 +162,7 @@ msgstr " Sposób przypięcia: "
msgid " Version table:"
msgstr " Tabela wersji:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -257,12 +257,12 @@ msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 5.0.3 Disk 1\""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Proszę włożyć dysk do napędu i nacisnąć enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Nie udało się zamontować \"%s\" w \"%s\""
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Należy powtórzyć ten proces dla reszty płyt."
@@ -784,12 +784,12 @@ msgstr "Nie odnaleziono dysku."
msgid "File not found"
msgstr "Nie odnaleziono pliku"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Nie udało się wykonać operacji stat"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Nie udało się ustawić czasu modyfikacji"
@@ -1055,7 +1055,7 @@ msgstr ""
"Następujące podpisy nie mogły zostać zweryfikowane z powodu braku klucza "
"publicznego:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Puste pliki nie mogą być prawidłowymi archiwami"
@@ -1391,108 +1391,108 @@ msgstr "Zainstalować te pakiety bez weryfikacji?"
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Zainstalowany]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Następujące pakiety mają niespełnione zależności:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ale %s jest zainstalowany"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s ma zostać zainstalowany"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ale nie da się go zainstalować"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ale jest pakietem wirtualnym"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ale nie jest zainstalowany"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ale nie zostanie zainstalowany"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " lub"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Następujące pakiety zostaną USUNIĘTE:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Następujące pakiety zostały zatrzymane:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Następujące pakiety zostaną zaktualizowane:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (z powodu %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1500,27 +1500,27 @@ msgstr ""
"UWAGA: Zostaną usunięte następujące istotne pakiety.\n"
"NIE należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ponownie instalowanych, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu cofniętych wersji, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
@@ -1529,7 +1529,7 @@ msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[T/n]"
@@ -1537,21 +1537,21 @@ msgstr "[T/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[t/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "T"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Błąd kompilacji wyrażenia regularnego - %s"
@@ -1727,7 +1727,7 @@ msgstr "Nie udało się otworzyć pliku serwera lustrzanego \"%s\""
msgid "[Mirror: %s]"
msgstr "[Serwer lustrzany: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Nie udało się utworzyć potoku IPC do podprocesu"
@@ -2086,47 +2086,47 @@ msgstr "Nieprawidłowa linia %llu #2 pliku override %s"
msgid "Malformed override %s line %llu #3"
msgstr "Nieprawidłowa linia %llu #3 pliku override %s"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Nieznany algorytm kompresji \"%s\""
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Nie udało się utworzyć obiektu FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Nie udało się utworzyć procesu potomnego"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Potomny proces kompresujÄ…cy"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Błąd wewnętrzny, nie udało się utworzyć %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Zawiodła operacja IO na pliku/podprocesie"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Nie udało się czytanie w czasie liczenia skrótu MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problem przy usuwaniu %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Nie udało się zmienić nazwy %s na %s"
@@ -2261,12 +2261,12 @@ msgstr "Podwójne dodanie ominięcia %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Zduplikowany plik konfiguracyjny %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Nie udało się zapisać pliku %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Nie udało się zamknąć pliku %s"
@@ -2654,22 +2654,22 @@ msgstr "należało przeczytać jeszcze %llu, ale nic nie zostało"
msgid "write, still have %llu to write but couldn't"
msgstr "należało zapisać jeszcze %llu, ale nie udało się to"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem przy zamykaniu pliku %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem przy zapisywaniu pliku %s w %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem przy odlinkowywaniu pliku %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problem przy zapisywaniu pliku na dysk"
@@ -2930,7 +2930,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Brakuje katalogu list %spartial."
@@ -3102,7 +3102,7 @@ msgstr "Błędny rozmiar"
msgid "Invalid file format"
msgstr "Nieprawidłowa operacja %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3111,16 +3111,16 @@ msgstr ""
"Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release "
"(nieprawidłowy wpis sources.list lub nieprawidłowy plik)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3129,12 +3129,12 @@ msgstr ""
"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
"repozytorium nie będą wykonywane."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3144,12 +3144,12 @@ msgstr ""
"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "BÅ‚Ä…d GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3158,12 +3158,12 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3200,50 +3200,41 @@ msgstr "Nieprawidłowy wpis Date w pliku Release %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Blok producenta %s nie zawiera odcisku"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Użycie %s jako punktu montowania CD-ROM-u\n"
-"Montowanie CD-ROM-u\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identyfikacja.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Etykieta: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Odmontowanie CD-ROM-u...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Użycie %s jako punktu montowania CD-ROM-u\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Odmontowanie CD-ROM-u\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Oczekiwanie na płytę...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Montowanie CD-ROM-u...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identyfikacja.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Etykieta: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Odmontowanie CD-ROM-u...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Skanowanie płyty w poszukiwaniu plików indeksu..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3252,7 +3243,7 @@ msgstr ""
"Znaleziono %zu indeksów pakietów, %zu indeksów źródłowych, %zu indeksów "
"tłumaczeń i %zu podpisów\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3260,16 +3251,16 @@ msgstr ""
"Nie można odnaleźć żadnych plików pakietów, być może nie jest to dysk "
"Debiana lub jest to inna architektura?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Znaleziono etykietÄ™ \"%s\"\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "To nie jest prawidłowa nazwa, proszę spróbować ponownie.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3278,15 +3269,15 @@ msgstr ""
"PÅ‚yta nosi nazwÄ™: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopiowanie list pakietów..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Zapisywanie nowej listy źródeł\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Źródła dla tej płyty to:\n"
@@ -3599,6 +3590,13 @@ msgid "Not locked"
msgstr "Niezablokowany"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Użycie %s jako punktu montowania CD-ROM-u\n"
+#~ "Montowanie CD-ROM-u\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 8c6f82bad..ce7d19cf7 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -158,7 +158,7 @@ msgstr " Marcação do Pacote: "
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-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -254,12 +254,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Por favor insira um Disco no leitor e pressione enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Falhou ao montar '%s' para '%s'"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repita este processo para o resto dos CDs no seu conjunto."
@@ -777,12 +777,12 @@ msgstr "Disco não encontrado."
msgid "File not found"
msgstr "Ficheiro não encontrado"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Falhou o stat"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Falhou definir hora de modificação"
@@ -1047,7 +1047,7 @@ msgstr ""
"As seguintes assinaturas não puderam ser verificadas porque a chave pública "
"não está disponível:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Ficheiros vazios não podem ser arquivos válidos"
@@ -1367,108 +1367,108 @@ msgstr "Instalar estes pacotes sem verificação?"
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "mas não é instalável"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "mas não vai ser instalado"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Serão instalados os seguintes NOVOS pacotes:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Serão REMOVIDOS os seguintes pacotes:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Serão actualizados os seguintes pacotes:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (devido a %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1476,27 +1476,27 @@ msgstr ""
"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu a que foi feito o downgrade, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a remover e %lu não actualizados.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1505,7 +1505,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1513,21 +1513,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "N"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -1699,7 +1699,7 @@ msgstr "Não pode ler ficheiro de mirror '%s'"
msgid "[Mirror: %s]"
msgstr "[Mirror: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falha ao criar pipe IPC para subprocesso"
@@ -2058,47 +2058,47 @@ msgstr "Override %s malformado linha %llu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Override %s malformado linha %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Algoritmo de compressão desconhecido '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Saída compactada %s precisa de um conjunto de compressão"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Falhou criar FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Falhou o fork"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Compactar filho"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Erro Interno, falhou criar %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Falhou o IO para subprocesso/arquivo"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Falhou ler durante o cálculo de MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problema ao executar unlinking %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Falhou renomear %s para %s"
@@ -2233,12 +2233,12 @@ msgstr "Adição dupla de desvio %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Arquivo de configuração duplicado %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Falhou escrever o ficheiro %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Falhou fechar o ficheiro %s"
@@ -2630,22 +2630,22 @@ msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum"
msgid "write, still have %llu to write but couldn't"
msgstr "escritos, ainda restam %llu para escrever mas não foi possível"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problema ao fechar o ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problema ao renomear o ficheiro %s para %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problema ao remover o link do ficheiro %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problema sincronizando o ficheiro"
@@ -2908,7 +2908,7 @@ msgstr ""
"Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
"estragados."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta directório de listas %spartial."
@@ -3089,7 +3089,7 @@ msgstr "Tamanho incorrecto"
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3098,18 +3098,18 @@ msgstr ""
"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
"errada em sources.list ou ficheiro malformado)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Não existe qualquer chave pública disponível para as seguintes IDs de "
"chave:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3118,12 +3118,12 @@ msgstr ""
"O ficheiro Release para %s está expirado (inválido desde %s). Não serão "
"aplicadas as actualizações para este repositório."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3134,12 +3134,12 @@ msgstr ""
"GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erro GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3149,12 +3149,12 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3192,50 +3192,41 @@ msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "O bloco de fabricante %s não contém a impressão digital"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Utilizando o ponto de montagem do CD-ROM %s\n"
-"A montar o CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "A identificar.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Label Guardada: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "A desmontar o CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "A utilizar o ponto de montagem do CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "A desmontar o CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "A aguardar pelo disco...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "A montar o CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "A identificar.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Label Guardada: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "A desmontar o CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "A pesquisar os ficheiros de índice do disco..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3244,7 +3235,7 @@ msgstr ""
"Foram encontrados %zu índices de pacotes, %zu índices de código-fonte, %zu "
"índices de tradução e %zu assinaturas\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3252,16 +3243,16 @@ msgstr ""
"Não foi possível localizar quaisquer ficheiros de pacote, talvez este não "
"seja um disco Debian ou seja a arquitectura errada?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Encontrada a etiqueta '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Isso não é um nome válido, tente novamente.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3270,15 +3261,15 @@ msgstr ""
"Este disco tem o nome: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "A copiar listas de pacotes..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "A escrever lista de novas source\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "As entradas de listas de Source para este Disco são:\n"
@@ -3589,6 +3580,13 @@ msgid "Not locked"
msgstr "Sem acesso exclusivo"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Utilizando o ponto de montagem do CD-ROM %s\n"
+#~ "A montar o CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c2211ccd0..6d0e09792 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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."
@@ -158,7 +158,7 @@ msgstr " Pacote alfinetado (\"pin\"): "
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-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -259,12 +259,12 @@ msgstr ""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Por favor, insira um Disco na unidade e pressione enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Falhou ao renomear %s para %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repita este processo para o restante dos CDs em seu conjunto."
@@ -748,12 +748,12 @@ msgstr "Disco não encontrado."
msgid "File not found"
msgstr "Arquivo não encontrado"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Falhou ao executar \"stat\""
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Falhou ao definir hora de modificação"
@@ -1019,7 +1019,7 @@ msgstr ""
"As assinaturas a seguir não puderam ser verificadas devido à chave pública "
"não estar disponível:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1342,108 +1342,108 @@ msgstr "Instalar estes pacotes sem verificação?"
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Instalado]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir têm dependências desencontradas:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "mas %s está para ser instalado"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "mas não é instalável"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "mas não será instalado"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " ou"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Os NOVOS pacotes a seguir serão instalados:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Os pacotes a seguir serão REMOVIDOS:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Os pacotes a seguir serão atualizados:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Os pacotes a seguir serão REVERTIDOS:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Os seguintes pacotes mantidos serão mudados:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por causa de %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1452,27 +1452,27 @@ msgstr ""
"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
"fazendo!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu revertidos, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a serem removidos e %lu não atualizados.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
@@ -1481,7 +1481,7 @@ msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[S/n]"
@@ -1489,21 +1489,21 @@ msgstr "[S/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[s/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "S"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -1671,7 +1671,7 @@ msgstr "Não foi possível abrir arquivo %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Falhou ao criar pipe IPC para sub-processo"
@@ -2034,47 +2034,47 @@ msgstr "Override malformado %s linha %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Override malformado %s linha %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Algoritmo de compactação desconhecido '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Saída compactada %s precisa de um conjunto de compactação"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Falhou ao criar FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Falhou ao executar \"fork\""
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Compactar filho"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Erro interno, falhou ao criar %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "E/S para sub-processo/arquivo falhou"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Falhou ao ler durante o cálculo MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problema removendo %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Falhou ao renomear %s para %s"
@@ -2211,12 +2211,12 @@ msgstr "Adição dupla de desvio %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Arquivo de configuração duplicado %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Falhou ao escrever arquivo %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Falhou ao fechar arquivo %s"
@@ -2596,22 +2596,22 @@ msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
msgid "write, still have %llu to write but couldn't"
msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Problema fechando o arquivo"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problema sincronizando o arquivo"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Problema removendo o arquivo"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problema sincronizando o arquivo"
@@ -2873,7 +2873,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Diretório de listas %spartial está faltando."
@@ -3051,35 +3051,35 @@ msgstr "Tamanho incorreto"
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3087,12 +3087,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3102,12 +3102,12 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3145,50 +3145,41 @@ msgstr "Impossível analisar arquivo de pacote %s (1)"
msgid "Vendor block %s contains no fingerprint"
msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Usando ponto de montagem de CD-ROM %s\n"
-"Montando CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identificando.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Rótulo armazenado: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Desmontando CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Usando ponto de montagem de CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Desmontando CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Aguardando por disco...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Montando CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identificando.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Rótulo armazenado: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Procurando por arquivos de índice no disco..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3197,22 +3188,22 @@ msgstr ""
"Encontrado(s) %zu índice(s) de pacote(s), %zu índice(s) de fonte(s), %zu "
"índice(s) de traduções e %zu assinatura(s)\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Rótulo encontrado: '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Este não é um nome válido, tente novamente.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3221,15 +3212,15 @@ msgstr ""
"Esse disco é chamado: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Copiando lista de pacotes..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Gravando nova lista de fontes\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Entradas na lista de fontes para este disco são:\n"
@@ -3514,6 +3505,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Usando ponto de montagem de CD-ROM %s\n"
+#~ "Montando CD-ROM\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Nota, selecionando %s para expressão regular '%s'\n"
diff --git a/po/ro.po b/po/ro.po
index 5ff851765..a89a9131f 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -159,7 +159,7 @@ msgstr " Pachet ales special: "
msgid " Version table:"
msgstr " Tabela de versiuni:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -257,12 +257,12 @@ msgstr "FurnizaÈ›i un nume pentru acest disc, de exemplu „Debian 2.1r1 Disk 1â
msgid "Please insert a Disc in the drive and press enter"
msgstr "Introduceți un disc în unitate și apăsați Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Eșec la redenumirea lui %s în %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repetați această procedură pentru restul CD-urilor din set."
@@ -747,12 +747,12 @@ msgstr "Disc negăsit."
msgid "File not found"
msgstr "Fișier negăsit"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "EÈ™ec la „statâ€"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Eșec la ajustarea timpului de modificare"
@@ -1020,7 +1020,7 @@ msgstr ""
"Următoarele semnături n-au putut fi verificate, deoarece cheia publică nu "
"este disponibilă:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1348,108 +1348,108 @@ msgstr "Instalați aceste pachete fără verificare?"
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Instalat]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Următoarele pachete au dependențe neîndeplinite:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "dar %s este instalat"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "dar %s este pe cale de a fi instalat"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "dar nu este instalabil"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "dar este un pachet virtual"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "dar nu este instalat"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "dar nu este pe cale să fie instalat"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " sau"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Următoarele pachete NOI vor fi instalate:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Următoarele pachete vor fi ȘTERSE:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Următoarele pachete au fost reținute:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Următoarele pachete vor fi ÎNNOITE:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Următoarele pachete vor fi DE-GRADATE:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Următoarele pachete ținute vor fi schimbate:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (datorită %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1457,27 +1457,27 @@ msgstr ""
"AVERTISMENT: Următoarele pachete esențiale vor fi șterse.\n"
"Aceasta NU ar trebui făcută decât dacă știți exact ce vreți!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu înnoite, %lu nou instalate, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalate, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu de-gradate, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu de șters și %lu neînnoite.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu instalate sau șterse incomplet.\n"
@@ -1486,7 +1486,7 @@ msgstr "%lu instalate sau șterse incomplet.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1494,21 +1494,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "Y"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -1677,7 +1677,7 @@ msgstr "Nu s-a putut deschide fișierul %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Eșec la crearea conexiunii IPC către subproces"
@@ -2042,47 +2042,47 @@ msgstr "Înlocuire greșită %s linia %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Înlocuire greșită %s linia %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Algoritm de compresie necunoscut '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Eșec la crearea FIȘIERULUI*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "EÈ™ec la „forkâ€"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Comprimare copil"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Eroare internă, eșec la crearea lui %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "IE către subproces/fișier eșuat"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Eșec la citire în timpul calculului sumei MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problemă la desfacerea %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Eșec la redenumirea lui %s în %s"
@@ -2220,12 +2220,12 @@ msgstr "Adăugare dublă de redirectare %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Fișier „conf†duplicat %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Eșec la scrierea fișierului %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Eșec la închiderea fișierului %s"
@@ -2606,22 +2606,22 @@ msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
msgid "write, still have %llu to write but couldn't"
msgstr "scriere, încă mai am %lu de scris dar nu pot"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Problemă la închiderea fișierului"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problemă în timpul sincronizării fișierului"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Problemă la dezlegarea fișierului"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problemă în timpul sincronizării fișierului"
@@ -2877,7 +2877,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Directorul de liste %spartial lipsește."
@@ -3056,37 +3056,37 @@ msgstr "Nepotrivire dimensiune"
msgid "Invalid file format"
msgstr "Operațiune invalidă %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Nu există nici o cheie publică disponibilă pentru următoarele "
"identificatoare de chei:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3094,12 +3094,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3108,12 +3108,12 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3151,51 +3151,42 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
msgid "Vendor block %s contains no fingerprint"
msgstr "Blocul vânzător %s nu conține amprentă"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Utilizare puct de montare CD-ROM %s\n"
-"Montare CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identificare.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Etichetă memorată: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Se demontează CD-ul...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Utilizare punct de montare CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Demontare CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Aștept discul...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Montez CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identificare.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Etichetă memorată: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Se demontează CD-ul...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Scanez discul de fișierele index..\n"
# DEVELOPERS: please consider using somehow plural forms
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3204,22 +3195,22 @@ msgstr ""
"Au fost găsite %zu indexuri de pachete, %zu indexuri de surse, %zu indexuri "
"de traduceri și %zu semnături\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "A fost găsită eticheta „%sâ€\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Acesta nu este un nume valid, mai încercați.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3228,15 +3219,15 @@ msgstr ""
"Acest disc este numit: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Copiez listele de pachete.."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Scriere noua listă sursă\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Intrările listei surselor pentru acest disc sunt:\n"
@@ -3520,6 +3511,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Utilizare puct de montare CD-ROM %s\n"
+#~ "Montare CD-ROM\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
diff --git a/po/ru.po b/po/ru.po
index 786621f57..c4faf8f62 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -163,7 +163,7 @@ msgstr " ФикÑатор пакета: "
msgid " Version table:"
msgstr " Таблица верÑий:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -257,12 +257,12 @@ msgstr "Задайте Ð¸Ð¼Ñ Ð´Ð»Ñ Ñтого диÑка, например «D
msgid "Please insert a Disc in the drive and press enter"
msgstr "Ð’Ñтавьте диÑк в уÑтройÑтво и нажмите ввод"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Ðе удалоÑÑŒ примонтировать «%s» к «%s»"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Повторите Ñтот процеÑÑ Ð´Ð»Ñ Ð²Ñех имеющихÑÑ CD."
@@ -782,12 +782,12 @@ msgstr "ДиÑк не найден."
msgid "File not found"
msgstr "Файл не найден"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Ðе удалоÑÑŒ получить атрибуты"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Ðе удалоÑÑŒ уÑтановить Ð²Ñ€ÐµÐ¼Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
@@ -1054,7 +1054,7 @@ msgstr ""
"Следующие подпиÑи не могут быть проверены, так как недоÑтупен открытый "
"ключ:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "ПуÑтые файлы не могут быть допуÑтимыми архивами"
@@ -1385,109 +1385,109 @@ msgstr "УÑтановить Ñти пакеты без проверки?"
msgid "Failed to fetch %s %s\n"
msgstr "Ðе удалоÑÑŒ получить %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [УÑтановлен]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [УÑтановлен]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [УÑтановлен]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [УÑтановлен]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Пакеты, имеющие неудовлетворённые завиÑимоÑти:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "но %s уже уÑтановлен"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "но %s будет уÑтановлен"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "но он не может быть уÑтановлен"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "но Ñто виртуальный пакет"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "но он не уÑтановлен"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "но он не будет уÑтановлен"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " или"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "ÐОВЫЕ пакеты, которые будут уÑтановлены:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Пакеты, которые будут УДÐЛЕÐЫ:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Пакеты, которые будут оÑтавлены в неизменном виде:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Пакеты, которые будут обновлены:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакеты, будут заменены на более СТÐРЫЕ верÑии:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr ""
"Пакеты, которые должны были бы оÑтатьÑÑ Ð±ÐµÐ· изменений, но будут заменены:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (вÑледÑтвие %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1495,27 +1495,27 @@ msgstr ""
"Ð’ÐИМÐÐИЕ: Эти ÑущеÑтвенно важные пакеты будут удалены.\n"
"ÐЕ ДЕЛÐЙТЕ Ñтого, еÑли вы ÐЕ предÑтавлÑете Ñебе вÑе возможные поÑледÑтвиÑ!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "обновлено %lu, уÑтановлено %lu новых пакетов, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "переуÑтановлено %lu переуÑтановлено, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu пакетов заменены на Ñтарые верÑии, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ð¾ %lu пакетов, и %lu пакетов не обновлено.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не уÑтановлено до конца или удалено %lu пакетов.\n"
@@ -1524,7 +1524,7 @@ msgstr "не уÑтановлено до конца или удалено %lu п
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[Д/н]"
@@ -1532,21 +1532,21 @@ msgstr "[Д/н]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "д"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "н"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Ошибка компилÑции регулÑрного Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ â€” %s"
@@ -1721,7 +1721,7 @@ msgstr "Ðевозможно прочитать файл на зеркале «%
msgid "[Mirror: %s]"
msgstr "[Зеркало: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Ðе удалоÑÑŒ Ñоздать IPC-канал Ð´Ð»Ñ Ð¿Ð¾Ñ€Ð¾Ð¶Ð´Ñ‘Ð½Ð½Ð¾Ð³Ð¾ процеÑÑа"
@@ -2082,48 +2082,48 @@ msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ о переназначении (o
msgid "Malformed override %s line %llu #3"
msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ о переназначении (override) %s в Ñтроке %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "ÐеизвеÑтный алгоритм ÑÐ¶Ð°Ñ‚Ð¸Ñ Â«%s»"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr ""
"Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñжатого вывода %s необходимо включить иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑжатиÑ"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Ðе удалоÑÑŒ Ñоздать FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Ðе удалоÑÑŒ запуÑтить порождённый процеÑÑ"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "ПроцеÑÑ-потомок, производÑщий Ñжатие"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "ВнутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°, не удалоÑÑŒ Ñоздать %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Ошибка ввода/вывода в подпроцеÑÑ/файл"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð²Ñ‹Ñ‡Ð¸ÑÐ»ÐµÐ½Ð¸Ñ MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Ðе удалоÑÑŒ удалить %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Ðе удалоÑÑŒ переименовать %s в %s"
@@ -2258,12 +2258,12 @@ msgstr "Двойное добавление diversion %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Повторно указан файл наÑтройки %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Ðе удалоÑÑŒ запиÑать в файл %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Ðе удалоÑÑŒ закрыть файл %s"
@@ -2655,22 +2655,22 @@ msgstr ""
msgid "write, still have %llu to write but couldn't"
msgstr "ошибка при запиÑи; ÑобиралиÑÑŒ запиÑать ещё %llu байт, но не Ñмогли"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Проблема Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Проблема при переименовании файла %s в %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Проблема при удалении файла %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Проблема при Ñинхронизации файла"
@@ -2932,7 +2932,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ðевозможно иÑправить ошибки, у Ð²Ð°Ñ Ð¾Ñ‚Ð»Ð¾Ð¶ÐµÐ½Ñ‹ (held) битые пакеты."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Каталог ÑпиÑка %spartial отÑутÑтвует."
@@ -3109,7 +3109,7 @@ msgstr "Ðе Ñовпадает размер"
msgid "Invalid file format"
msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3118,16 +3118,16 @@ msgstr ""
"Ðевозможно найти ожидаемый Ñлемент «%s» в файле Release (Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ "
"в sources.list или файл)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ðевозможно найти хеш-Ñумму «%s» в файле Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "ÐедоÑтупен открытый ключ Ð´Ð»Ñ Ñледующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3136,12 +3136,12 @@ msgstr ""
"Файл Release Ð´Ð»Ñ %s проÑрочен (недоÑтоверный Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ %s). Обновление Ñтого "
"Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑŒÑÑ Ð½Ðµ будет."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт раÑпроÑтранениÑ: %s (ожидалÑÑ %s, но получен %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3151,12 +3151,12 @@ msgstr ""
"иÑпользованы предыдущие индекÑные файлы. Ошибка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Ошибка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3165,12 +3165,12 @@ msgstr ""
"Ðе удалоÑÑŒ обнаружить файл пакета %s. Это может означать, что вам придётÑÑ "
"вручную иÑправить Ñтот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Ðевозможно найти иÑточник Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ «%2$s» верÑии «%1$s»"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3206,50 +3206,41 @@ msgstr "Ðеправильный Ñлемент «Date» в файле Release %
msgid "Vendor block %s contains no fingerprint"
msgstr "Блок поÑтавщика %s не Ñодержит отпечатка (fingerprint)"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Ð’ качеÑтве точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ CD-ROM иÑпользуетÑÑ %s\n"
-"МонтируетÑÑ CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "ИдентификациÑ.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Ðайдена метка: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Размонтирование CD-ROM…\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "ИÑпользование %s в качеÑтве точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ CD-ROM\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Размонтирование CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Ожидание операции работы Ñ Ð´Ð¸Ñком…\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Монтирование CD-ROM…\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "ИдентификациÑ.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Ðайдена метка: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Размонтирование CD-ROM…\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "ПоиÑк на диÑке индекÑных файлов..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3258,7 +3249,7 @@ msgstr ""
"Ðайдено индекÑов: %zu Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð², %zu Ð´Ð»Ñ Ð¸Ñточников, %zu Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð¾Ð² и "
"%zu Ð´Ð»Ñ Ñигнатур\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3266,16 +3257,16 @@ msgstr ""
"Ðе удалоÑÑŒ найти ни одного файла пакетов; возможно Ñто не диÑк Debian или Ñ "
"не той архитектурой?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Ðайден Ñрлык «%s»\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Это неправильное имÑ, попробуйте ещё раз.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3284,15 +3275,15 @@ msgstr ""
"Ðазвание диÑка: \n"
"«%s»\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Копирование ÑпиÑков пакетов…"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "ЗапиÑÑŒ нового ÑпиÑка иÑточников\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "ЗапиÑи в ÑпиÑке иÑточников Ð´Ð»Ñ Ñтого диÑка:\n"
@@ -3603,6 +3594,13 @@ msgid "Not locked"
msgstr "Ðе заблокирован"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Ð’ качеÑтве точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ CD-ROM иÑпользуетÑÑ %s\n"
+#~ "МонтируетÑÑ CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 6d55616b7..495b096d4 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -159,7 +159,7 @@ msgstr " Pripevnený balík:"
msgid " Version table:"
msgstr " Tabuľka verzií:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -254,12 +254,12 @@ msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1â€
msgid "Please insert a Disc in the drive and press enter"
msgstr "Vložte disk do mechaniky a stlaÄte Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Pripojenie „%s“ na „%s“ zlyhalo"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Zopakujte tento postup pre všetky CD v sade diskov."
@@ -768,12 +768,12 @@ msgstr "Disk sa nenašiel."
msgid "File not found"
msgstr "Súbor sa nenašiel"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Vyhodnotenie zlyhalo"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Zlyhalo nastavenie Äasu zmeny"
@@ -1034,7 +1034,7 @@ msgstr ""
"Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
"kľúÄ:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Prázdne súbory nemôžu byť platné archívy"
@@ -1362,108 +1362,108 @@ msgstr "Nainštalovať tieto nekontrolované balíky?"
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Nainštalovaný]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Nasledovné balíky majú nesplnené závislosti:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ale nainštalovaný je %s"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ale inštalovať sa bude %s"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ale sa nedá nainštalovať"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ale je to virtuálny balík"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ale nie je nainštalovaný"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ale sa nebude inštalovať"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " alebo"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Nasledovné balíky sa ODSTRÃNIA:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Nasledovné balíky sa ponechajú v súÄasnej verzii:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Nasledovné balíky sa aktualizujú:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Nasledovné pridržané balíky sa zmenia:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvôli %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1471,27 +1471,27 @@ msgstr ""
"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
"Ak presne neviete, Äo robíte, tak to NEROBTE!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinštalovaných, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradovaných, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu iba ÄiastoÄne nainÅ¡talovaných alebo odstránených.\n"
@@ -1500,7 +1500,7 @@ msgstr "%lu iba ÄiastoÄne nainÅ¡talovaných alebo odstránených.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1508,21 +1508,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -1695,7 +1695,7 @@ msgstr "Nepodarilo sa preÄítaÅ¥ súbor „%s“ na zrkadle"
msgid "[Mirror: %s]"
msgstr "[Zrkadlo: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
@@ -2048,47 +2048,47 @@ msgstr "Skomolený „override“ %s riadok %llu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Skomolený „override“ %s riadok %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Neznámy kompresný algoritmus „%s“"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Zlyhalo vytvorenie FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Volanie fork() zlyhalo"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Komprimovať potomka"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "V/V operácia s podprocesom/súborom zlyhala"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Chyba Äítania pri výpoÄte MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problém s odlinkovaním %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Premenovanie %s na %s zlyhalo"
@@ -2222,12 +2222,12 @@ msgstr "Dvojité pridanie diverzie %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Duplicitný konfiguraÄný súbor %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Zápis súboru %s zlyhal"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Zatvorenie súboru %s zlyhalo"
@@ -2610,22 +2610,22 @@ msgstr "Äítanie, treba preÄítaÅ¥ eÅ¡te %llu, ale už niÄ neostáva"
msgid "write, still have %llu to write but couldn't"
msgstr "zápis, treba zapísať ešte %llu, no nedá sa to"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problém pri zatváraní súboru %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problém pri synchronizovaní súboru %s na %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problém pri odstraňovaní súboru %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problém pri synchronizovaní súboru"
@@ -2881,7 +2881,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Adresár zoznamov %spartial chýba."
@@ -3054,7 +3054,7 @@ msgstr "Veľkosti sa nezhodujú"
msgid "Invalid file format"
msgstr "Neplatná operácia %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3063,16 +3063,16 @@ msgstr ""
"Nepodarilo sa nájsÅ¥ oÄakávanú položku „%s“ v súbore Release (Nesprávna "
"položka sources.list alebo chybný formát súboru)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nie sú dostupné žiadne verejné kľúÄe ku kľúÄom s nasledovnými ID:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3081,12 +3081,12 @@ msgstr ""
"Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja "
"softvéru sa nepoužijú."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "V konflikte s distribúciou: %s (oÄakávalo sa %s ale dostali sme %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3096,12 +3096,12 @@ msgstr ""
"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3110,12 +3110,12 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3151,50 +3151,41 @@ msgstr "Chýba položka „Date“ v súbore Release %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Blok výrobcu %s neobsahuje otlaÄok (fingerprint)"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Použije sa CD-ROM prípojný bod %s\n"
-"Pripája sa CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identifikuje sa.."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Uložená menovka: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM sa odpája...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Použije sa prípojný bod CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "CD-ROM sa odpája\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Čaká sa na disk...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Pripája sa CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identifikuje sa.."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Uložená menovka: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM sa odpája...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Na disku sa hľadajú indexové súbory..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3203,7 +3194,7 @@ msgstr ""
"Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov "
"prekladov a %zu signatúr\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3211,16 +3202,16 @@ msgstr ""
"Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom "
"alebo je pre nesprávnu architektúru?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Nájdená menovka: „%s“\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Neplatný názov, skúste znova.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3229,15 +3220,15 @@ msgstr ""
"Názov tohto disku je: \n"
"„%s“\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopírujú sa zoznamy balíkov..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Zapisuje sa nový zoznam zdrojov\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
@@ -3537,6 +3528,13 @@ msgid "Not locked"
msgstr "Nie je zamknuté"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Použije sa CD-ROM prípojný bod %s\n"
+#~ "Pripája sa CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 5ece639cc..a0ee37460 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -157,7 +157,7 @@ msgstr " Bucika paketa: "
msgid " Version table:"
msgstr " Preglednica razliÄic:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -252,12 +252,12 @@ msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'"
msgid "Please insert a Disc in the drive and press enter"
msgstr "Vstavite disk v pogon in pritisnite vnosno tipko"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Priklapljanje '%s' na '%s' je spodletelo"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki."
@@ -763,12 +763,12 @@ msgstr "Diska ni mogoÄe najti."
msgid "File not found"
msgstr "Datoteke ni mogoÄe najti"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "DoloÄitev ni uspela"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Nastavitev Äasa spremembe je spodletela"
@@ -1029,7 +1029,7 @@ msgid ""
msgstr ""
"Naslednjih podpisov ni mogoÄe preveriti, ker javni kljuÄ ni na voljo:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
@@ -1361,108 +1361,108 @@ msgstr "Ali želite te pakete namestiti brez preverjanja?"
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoÄe dobiti %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [NameÅ¡Äeno]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [NameÅ¡Äeno]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [NameÅ¡Äeno]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [NameÅ¡Äeno]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Naslednji paketi imajo nerešene odvisnosti:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "vendar je paket %s nameÅ¡Äen"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "vendar bo paket %s nameÅ¡Äen"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "vendar se ga ne da namestiti"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "vendar je navidezen paket"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "vendar ni nameÅ¡Äen"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "vendar ne bo nameÅ¡Äen"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " ali"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Naslednji NOVI paketi bodo nameÅ¡Äeni:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Naslednji paketi so bili zadržani:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Naslednji paketi bodo nadgrajeni:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Naslednji paketi bodo POSTARANI:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Naslednji zadržani paketi bodo spremenjeni:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (zaradi %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1470,27 +1470,27 @@ msgstr ""
"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
"Tega NE storite, razen Äe ne veste natanko kaj poÄenjate!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nadgrajenih, %lu na novo nameÅ¡Äenih, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu posodobljenih, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu postaranih, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ne popolnoma nameÅ¡Äenih ali odstranjenih.\n"
@@ -1499,7 +1499,7 @@ msgstr "%lu ne popolnoma nameÅ¡Äenih ali odstranjenih.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1507,21 +1507,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka med prevajanjem logiÄnega izraza - %s"
@@ -1695,7 +1695,7 @@ msgstr "Datoteke zrcalnega strežnika '%s' ni mogoÄe prebrati"
msgid "[Mirror: %s]"
msgstr "[Zrcalni strežnik: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Ustvarjanje cevi IPC do podopravila je spodletelo"
@@ -2049,47 +2049,47 @@ msgstr "Slabo oblikovan prepis %s v vrstici %llu Å¡t. 1"
msgid "Malformed override %s line %llu #3"
msgstr "Slabo oblikovan prepis %s v vrstici %llu Å¡t. 3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Neznan algoritem stiskanja '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Stisnjen izhod %s potrebuje niz stiskanja"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Ustvarjanje DATOTEKE* ni uspelo"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Vejitev ni uspela"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Podrejeni predmet stiskanja"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Notranja napaka. Ni mogoÄe ustvariti %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "VI podopravila/datoteke je spodletel"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Med raÄunanjem MD5 ni mogoÄe brati"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Napaka med odvezovanjem %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Ni mogoÄe preimenovati %s v %s"
@@ -2225,12 +2225,12 @@ msgstr "Dvojni seštevek odklona %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Dvojnik datoteke z nastavitvami %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Zapisovanje datoteke %s je spodletelo"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Napaka med zapiranjem datoteke %s"
@@ -2612,22 +2612,22 @@ msgstr "Prebrano, Å¡e vedno je treba prebrati %llu bajtov, vendar ni niÄ ostalo
msgid "write, still have %llu to write but couldn't"
msgstr "pisanje, preostalo je Å¡e %llu za pisanje, vendar ni bilo mogoÄe pisati"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Težava med zapiranjem datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Težava med preimenovanje datoteke %s v %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Težava med razvezovanjem datoteke %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Težava med usklajevanjem datoteke"
@@ -2888,7 +2888,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ni mogoÄe popraviti težav. Imate pokvarjene pakete."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Mapa seznama %spartial manjka."
@@ -3059,7 +3059,7 @@ msgstr "Neujemanje velikosti"
msgid "Invalid file format"
msgstr "Neveljavno opravilo %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3068,16 +3068,16 @@ msgstr ""
"Ni mogoÄe najti priÄakovanega vnosa '%s' v datoteki Release (napaÄen vnos "
"sources.list ali slabo oblikovana datoteka)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni mogoÄe najti vsote razprÅ¡evanja za '%s' v datoteki Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Za naslednje ID-je kljuÄa ni na voljo javnih kljuÄev:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3086,12 +3086,12 @@ msgstr ""
"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
"skladiÅ¡Äe ne bo uveljavljena."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribucija v sporu: %s (priÄakovana %s, toda dobljena %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3101,12 +3101,12 @@ msgstr ""
"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Napaka GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3115,12 +3115,12 @@ msgstr ""
"Ni bilo mogoÄe najti datoteke za paket %s. Morda boste morali roÄno "
"popraviti ta paket (zaradi manjkajoÄega arhiva)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Ni mogoÄe najti vira za prejem razliÄice '%s' paketa '%s'"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3158,50 +3158,41 @@ msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Uporabljanje CD-ROM-ove priklopne toÄke %s\n"
-"Priklapljanje CD-ROM-a\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identificiranje ... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Shranjena oznaka: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Odklapljanje CD-ROM-a ...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Uporabljanje CD-ROM-ove priklopne toÄke %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Odklapljanje CD-ROM-a\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "ÄŒakanje na disk ...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Priklapljanje CD-ROM-a ...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identificiranje ... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Shranjena oznaka: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Odklapljanje CD-ROM-a ...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Preiskovanje diska za datoteke kazala ..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3210,7 +3201,7 @@ msgstr ""
"Najdenih je bilo %zu kazal paketov, %zu kazal virov, %zu kazalov prevodov in "
"%zu podpisov\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3218,16 +3209,16 @@ msgstr ""
"Nobenih datotek paketov ni mogoÄe najti, morda to ni disk Debian ali pa je "
"arhitektura napaÄna?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Najdena je bila oznaka '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "To ni veljavno ime, poskusite znova.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3236,15 +3227,15 @@ msgstr ""
"Ta disk se imenuje: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopiranje seznama paketov ..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Pisanje novega seznama virov\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Izvorni vnosi za ta disk so:\n"
@@ -3545,6 +3536,13 @@ msgid "Not locked"
msgstr "Ni zaklenjeno"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Uporabljanje CD-ROM-ove priklopne toÄke %s\n"
+#~ "Priklapljanje CD-ROM-a\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 298573eea..fda0cac14 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -157,7 +157,7 @@ msgstr " Paketnålning: "
msgid " Version table:"
msgstr " Versionstabell:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -255,12 +255,12 @@ msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\""
msgid "Please insert a Disc in the drive and press enter"
msgstr "Mata in en skiva i enheten och tryck på Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Misslyckades med att montera \"%s\" till \"%s\""
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning."
@@ -747,12 +747,12 @@ msgstr "Skivan hittades inte."
msgid "File not found"
msgstr "Filen hittades inte"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Kunde inte ta status"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Misslyckades ställa in ändringstid"
@@ -1021,7 +1021,7 @@ msgstr ""
"Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är "
"tillgänglig:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1345,108 +1345,108 @@ msgstr "Installera dessa paket utan verifiering?"
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Installerat]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "men %s är installerat"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "men %s kommer att installeras"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "men det kan inte installeras"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "men det är ett virtuellt paket"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "men det är inte installerat"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "men det kommer inte att installeras"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " eller"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Följande NYA paket kommer att installeras:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Följande paket kommer att TAS BORT:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Följande paket har hållits tillbaka:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Följande paket kommer att uppgraderas:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Följande paket kommer att NEDGRADERAS:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Följande tillbakahållna paket kommer att ändras:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (på grund av %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1454,27 +1454,27 @@ msgstr ""
"VARNING: Följande systemkritiska paket kommer att tas bort.\n"
"Detta bör INTE genomföras såvida du inte vet exakt vad du gör!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu att uppgradera, %lu att nyinstallera, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu att installera om, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu att nedgradera, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu är inte helt installerade eller borttagna.\n"
@@ -1483,7 +1483,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[J/n]"
@@ -1491,21 +1491,21 @@ msgstr "[J/n]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[j/N]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "J"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid kompilering av reguljärt uttryck - %s"
@@ -1683,7 +1683,7 @@ msgstr "Ingen spegelfil \"%s\" hittades "
msgid "[Mirror: %s]"
msgstr "[Spegel: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Misslyckades med att skapa IPC-rör till underprocess"
@@ -2044,48 +2044,48 @@ msgstr "Felaktig override %s rad %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Felaktig override %s rad %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Okänd komprimeringsalgoritm \"%s\""
# ???
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Misslyckades med att skapa FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Misslyckades med att grena process"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Barnprocess för komprimering"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Internt fel, misslyckades med att skapa %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "In/ut för underprocess/fil misslyckades"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Misslyckades med att läsa vid beräkning av MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problem med att länka ut %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Misslyckades med att byta namn på %s till %s"
@@ -2220,12 +2220,12 @@ msgstr "Omdirigeringen %s -> %s inlagd två gånger"
msgid "Duplicate conf file %s/%s"
msgstr "Duplicerad konfigurationsfil %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Misslyckades med att skriva filen %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Misslyckades med att stänga filen %s"
@@ -2607,22 +2607,22 @@ msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
msgid "write, still have %llu to write but couldn't"
msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Problem med att stänga filen %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem med att byta namn på filen %s till %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem med att avlänka filen %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problem med att synkronisera filen"
@@ -2883,7 +2883,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listkatalogen %spartial saknas."
@@ -3057,35 +3057,35 @@ msgstr "Storleken stämmer inte"
msgid "Invalid file format"
msgstr "Felaktig åtgärd %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunde inte tolka \"Release\"-filen %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3096,12 +3096,12 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fel: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3110,12 +3110,12 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3151,50 +3151,41 @@ msgstr "Ogiltig \"Date\"-post i Release-filen %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Leverantörsblocket %s saknar fingeravtryck"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Använder cd-rom-monteringspunkten %s\n"
-"Monterar cd-rom\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identifierar.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Lagrad etikett: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterar cd-rom...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Använder cd-rom-monteringspunkten %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Avmonterar cd-rom\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Väntar på skiva...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Monterar cd-rom...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identifierar.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Lagrad etikett: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Avmonterar cd-rom...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Söker efter indexfiler på skivan...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3203,7 +3194,7 @@ msgstr ""
"Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu "
"signaturer\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3211,16 +3202,16 @@ msgstr ""
"Kunde inte hitta några paketfiler. Detta är kanske inte en Debian-skiva "
"eller felaktig arkitektur?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Hittade etiketten \"%s\"\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Namnet är ogiltigt, försök igen.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3229,15 +3220,15 @@ msgstr ""
"Denna skiva heter: \n"
"\"%s\"\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kopierar paketlistor..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Skriver ny källista\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Poster i källistan för denna skiva:\n"
@@ -3543,6 +3534,13 @@ msgid "Not locked"
msgstr "Inte låst"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Använder cd-rom-monteringspunkten %s\n"
+#~ "Monterar cd-rom\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/th.po b/po/th.po
index 263830ef1..83ee7e98f 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -155,7 +155,7 @@ msgstr " à¸à¸²à¸£à¸•à¸£à¸¶à¸‡à¹à¸žà¸à¹€à¸à¸ˆ: "
msgid " Version table:"
msgstr " ตารางรุ่น:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -249,12 +249,12 @@ msgstr "à¸à¸£à¸¸à¸“าตั้งชื่อà¹à¸œà¹ˆà¸™ เช่น 'Debian
msgid "Please insert a Disc in the drive and press enter"
msgstr "à¸à¸£à¸¸à¸“าใส่à¹à¸œà¹ˆà¸™à¸¥à¸‡à¹ƒà¸™à¹„ดรว์à¹à¸¥à¹‰à¸§à¸à¸” enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "ไม่สามารถเมานท์ '%s' ที่ '%s'"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "ทำเช่นนี้ต่อไปà¸à¸±à¸šà¹à¸œà¹ˆà¸™à¸‹à¸µà¸”ีที่เหลือในชุด"
@@ -749,12 +749,12 @@ msgstr "ไม่พบà¹à¸œà¹ˆà¸™"
msgid "File not found"
msgstr "ไม่พบà¹à¸Ÿà¹‰à¸¡"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "stat ไม่สำเร็จ"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "à¸à¸³à¸«à¸™à¸”เวลาà¹à¸à¹‰à¹„ขไม่สำเร็จ"
@@ -1011,7 +1011,7 @@ msgid ""
"available:\n"
msgstr "ลายเซ็นต่อไปนี้ไม่สามารถตรวจสอบได้ เพราะไม่มีà¸à¸¸à¸à¹à¸ˆà¸ªà¸²à¸˜à¸²à¸£à¸“ะ:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "à¹à¸Ÿà¹‰à¸¡à¸§à¹ˆà¸²à¸‡à¹€à¸›à¸¥à¹ˆà¸²à¹„ม่สามารถเป็นà¹à¸Ÿà¹‰à¸¡à¸ˆà¸±à¸”เà¸à¹‡à¸šà¸—ี่ใช้à¸à¸²à¸£à¹„ด้"
@@ -1318,108 +1318,108 @@ msgstr "จะติดตั้งà¹à¸žà¸à¹€à¸à¸ˆà¹€à¸«à¸¥à¹ˆà¸²à¸™à¸µà¹‰à¹‚
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [ติดตั้งอยู่]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "à¹à¸žà¸à¹€à¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้ขาดà¹à¸žà¸à¹€à¸à¸ˆà¸—ี่ต้องใช้:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "à¹à¸•à¹ˆà¸£à¸¸à¹ˆà¸™à¸—ี่ติดตั้งไว้คือ %s"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "à¹à¸•à¹ˆà¸£à¸¸à¹ˆà¸™à¸—ี่จะติดตั้งคือ %s"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "à¹à¸•à¹ˆà¹„ม่สามารถติดตั้งได้"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "à¹à¸•à¹ˆà¹à¸žà¸à¹€à¸à¸ˆà¸™à¸µà¹‰à¹€à¸›à¹‡à¸™à¹à¸žà¸à¹€à¸à¸ˆà¹€à¸ªà¸¡à¸·à¸­à¸™"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "à¹à¸•à¹ˆà¹„ด้ติดตั้งไว้"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "à¹à¸•à¹ˆà¹à¸žà¸à¹€à¸à¸ˆà¸™à¸µà¹‰à¸ˆà¸°à¹„ม่ถูà¸à¸•à¸´à¸”ตั้ง"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " หรือ"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "จะติดตั้งà¹à¸žà¸à¹€à¸à¸ˆ *ใหม่* ต่อไปนี้:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "จะ *ลบ* à¹à¸žà¸à¹€à¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "จะคงรุ่นà¹à¸žà¸à¹€à¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "จะปรับรุ่นà¹à¸žà¸à¹€à¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้ขึ้น:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "จะปรับรุ่นà¹à¸žà¸à¹€à¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้ *ลง*:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "จะเปลี่ยนà¹à¸›à¸¥à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¸„งรุ่นà¹à¸žà¸à¹€à¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (เนื่องจาภ%s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1427,27 +1427,27 @@ msgstr ""
"*คำเตือน*: à¹à¸žà¸à¹€à¸à¸ˆà¸—ี่จำเป็นต่อไปนี้จะถูà¸à¸–อดถอน\n"
"คุณ *ไม่ควร* ทำเช่นนี้ นอà¸à¸ˆà¸²à¸à¸„ุณเข้าใจสิ่งที่จะทำ!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "ติดตั้งซ้ำ %lu, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "ปรับรุ่นลง %lu, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "ถอดถอน %lu à¹à¸¥à¸°à¹„ม่ปรับรุ่น %lu\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
@@ -1456,7 +1456,7 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1464,21 +1464,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "คอมไพล์นิพจน์เรà¸à¸´à¸§à¸¥à¸²à¸£à¹Œà¹„ม่สำเร็จ - %s"
@@ -1649,7 +1649,7 @@ msgstr "ไม่สามารถอ่านà¹à¸Ÿà¹‰à¸¡à¹à¸«à¸¥à¹ˆà¸‡à¸ªà¸³
msgid "[Mirror: %s]"
msgstr "[à¹à¸«à¸¥à¹ˆà¸‡à¸ªà¸³à¹€à¸™à¸²: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "ไม่สามารถสร้างไปป์ IPC ไปยังโพรเซสย่อย"
@@ -1995,47 +1995,47 @@ msgstr "à¹à¸Ÿà¹‰à¸¡ override %s ผิดรูปà¹à¸šà¸šà¸—ี่บรรà¸
msgid "Malformed override %s line %llu #3"
msgstr "à¹à¸Ÿà¹‰à¸¡ override %s ผิดรูปà¹à¸šà¸šà¸—ี่บรรทัด %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "ไม่รู้จัà¸à¸­à¸±à¸¥à¸à¸­à¸£à¸´à¸—ึมบีบอัด '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "ผลลัพธ์ของà¸à¸²à¸£à¸šà¸µà¸šà¸­à¸±à¸” %s ต้องมีชุดของà¸à¸²à¸£à¸šà¸µà¸šà¸­à¸±à¸”ด้วย"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "สร้าง FILE* ไม่สำเร็จ"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "fork ไม่สำเร็จ"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "โพรเซสลูà¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸šà¸µà¸šà¸­à¸±à¸”"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "ข้อผิดพลาดภายใน: ไม่สามารถสร้าง %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "IO ไปยังโพรเซสย่อยหรือà¹à¸Ÿà¹‰à¸¡à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "อ่านà¹à¸Ÿà¹‰à¸¡à¹„ม่สำเร็จขณะคำนวณ MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "มีปัà¸à¸«à¸²à¸‚ณะลบà¹à¸Ÿà¹‰à¸¡ %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
@@ -2170,12 +2170,12 @@ msgstr "เพิ่ม diversion %s -> %s ซ้ำสอง"
msgid "Duplicate conf file %s/%s"
msgstr "à¹à¸Ÿà¹‰à¸¡à¸„่าตั้ง %s/%s ซ้ำ"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "ไม่สามารถเขียนà¹à¸Ÿà¹‰à¸¡ %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "ไม่สามารถปิดà¹à¸Ÿà¹‰à¸¡ %s"
@@ -2552,22 +2552,22 @@ msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้
msgid "write, still have %llu to write but couldn't"
msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน à¹à¸•à¹ˆà¹„ม่สามารถเขียนได้"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "เà¸à¸´à¸”ปัà¸à¸«à¸²à¸‚ณะปิดà¹à¸Ÿà¹‰à¸¡ %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "เà¸à¸´à¸”ปัà¸à¸«à¸²à¸‚ณะเปลี่ยนชื่อà¹à¸Ÿà¹‰à¸¡ %s ไปเป็น %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "เà¸à¸´à¸”ปัà¸à¸«à¸²à¸‚ณะลบà¹à¸Ÿà¹‰à¸¡ %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "เà¸à¸´à¸”ปัà¸à¸«à¸²à¸‚ณะ sync à¹à¸Ÿà¹‰à¸¡"
@@ -2823,7 +2823,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "ไม่สามารถà¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¹„ด้ คุณได้คงรุ่นà¹à¸žà¸à¹€à¸à¸ˆà¸—ี่เสียอยู่ไว้"
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "ไม่มีไดเรà¸à¸—อรีรายชื่อà¹à¸žà¸à¹€à¸à¸ˆ %spartial"
@@ -2992,7 +2992,7 @@ msgstr "ขนาดไม่ตรงà¸à¸±à¸™"
msgid "Invalid file format"
msgstr "ไม่รู้จัà¸à¸„ำสั่ง %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3001,16 +3001,16 @@ msgstr ""
"ไม่พบรายà¸à¸²à¸£ '%s' ที่ต้องà¸à¸²à¸£à¹ƒà¸™à¹à¸Ÿà¹‰à¸¡ Release (รายà¸à¸²à¸£ sources.list ไม่ถูà¸à¸•à¹‰à¸­à¸‡ "
"หรือà¹à¸Ÿà¹‰à¸¡à¸œà¸´à¸”รูปà¹à¸šà¸š)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "ไม่พบผลรวมà¹à¸®à¸Šà¸ªà¸³à¸«à¸£à¸±à¸š '%s' ในà¹à¸Ÿà¹‰à¸¡ Release"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "ไม่มีà¸à¸¸à¸à¹à¸ˆà¸ªà¸²à¸˜à¸²à¸£à¸“ะสำหรับà¸à¸¸à¸à¹à¸ˆà¸«à¸¡à¸²à¸¢à¹€à¸¥à¸‚ต่อไปนี้:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3019,12 +3019,12 @@ msgstr ""
"à¹à¸Ÿà¹‰à¸¡ Release สำหรับ %s หมดอายุà¹à¸¥à¹‰à¸§ (ตั้งà¹à¸•à¹ˆ %s ที่à¹à¸¥à¹‰à¸§) จะไม่ใช้รายà¸à¸²à¸£à¸›à¸£à¸±à¸šà¸£à¸¸à¹ˆà¸™à¸•à¹ˆà¸²à¸‡à¹† "
"ของคลังà¹à¸žà¸à¹€à¸à¸ˆà¸™à¸µà¹‰"
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "ชุดจัดà¹à¸ˆà¸à¸‚ัดà¹à¸¢à¹‰à¸‡à¸à¸±à¸™: %s (ต้องà¸à¸²à¸£ %s à¹à¸•à¹ˆà¸žà¸š %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3034,24 +3034,24 @@ msgstr ""
"ข้อผิดพลาดจาภGPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "ข้อผิดพลาดจาภGPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr "ไม่พบà¹à¸Ÿà¹‰à¸¡à¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸žà¸à¹€à¸à¸ˆ %s คุณอาจต้องà¹à¸à¹‰à¸›à¸±à¸à¸«à¸²à¹à¸žà¸à¹€à¸à¸ˆà¸™à¸µà¹‰à¹€à¸­à¸‡ (ไม่มี arch)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "ไม่พบà¹à¸«à¸¥à¹ˆà¸‡à¸—ี่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3087,50 +3087,41 @@ msgstr "รายà¸à¸²à¸£ 'Date' ไม่ถูà¸à¸•à¹‰à¸­à¸‡à¹ƒà¸™à¹à¸Ÿà¹‰à
msgid "Vendor block %s contains no fingerprint"
msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"à¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰à¸ˆà¸¸à¸”เมานท์ซีดีรอม %s\n"
-"à¸à¸³à¸¥à¸±à¸‡à¹€à¸¡à¸²à¸™à¸—์ซีดีรอม\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸£à¸§à¸ˆà¸ªà¸­à¸šà¸Šà¸·à¹ˆà¸­à¹à¸œà¹ˆà¸™.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "ชื่อที่เà¸à¹‡à¸šà¹„ว้: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸¥à¸´à¸à¹€à¸¡à¸²à¸™à¸—์ซีดีรอม...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰à¸ˆà¸¸à¸”เมานท์ซีดีรอม %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸¥à¸´à¸à¹€à¸¡à¸²à¸™à¸—์ซีดีรอม\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸£à¸­à¹à¸œà¹ˆà¸™...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸¡à¸²à¸™à¸—์ซีดีรอม...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸£à¸§à¸ˆà¸ªà¸­à¸šà¸Šà¸·à¹ˆà¸­à¹à¸œà¹ˆà¸™.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "ชื่อที่เà¸à¹‡à¸šà¹„ว้: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸¥à¸´à¸à¹€à¸¡à¸²à¸™à¸—์ซีดีรอม...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¸³à¸£à¸§à¸ˆà¸‚้อมูลในà¹à¸œà¹ˆà¸™à¹€à¸žà¸·à¹ˆà¸­à¸«à¸²à¹à¸Ÿà¹‰à¸¡à¸”ัชนี..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3139,22 +3130,22 @@ msgstr ""
"พบดัชนีà¹à¸žà¸à¹€à¸à¸ˆ %zu รายà¸à¸²à¸£, ดัชนีซอร์ส %zu รายà¸à¸²à¸£, ดัชนีคำà¹à¸›à¸¥ %zu รายà¸à¸²à¸£ à¹à¸¥à¸°à¸¥à¸²à¸¢à¹€à¸‹à¹‡à¸™ "
"%zu รายà¸à¸²à¸£\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr "ไม่พบà¹à¸Ÿà¹‰à¸¡à¹à¸žà¸à¹€à¸à¸ˆà¹ƒà¸”ๆ บางทีà¹à¸œà¹ˆà¸™à¸™à¸µà¹‰à¸­à¸²à¸ˆà¸ˆà¸°à¹„ม่ใช่à¹à¸œà¹ˆà¸™à¹€à¸”เบียน หรือสถาปัตยà¸à¸£à¸£à¸¡à¸­à¸²à¸ˆà¹„ม่ถูà¸à¸•à¹‰à¸­à¸‡"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "พบชื่อà¹à¸œà¹ˆà¸™ '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "ไม่ใช่ชื่อที่ใช้ได้ à¸à¸£à¸¸à¸“าลองใหม่\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3163,15 +3154,15 @@ msgstr ""
"à¹à¸œà¹ˆà¸™à¸™à¸µà¹‰à¹€à¸£à¸µà¸¢à¸à¸Šà¸·à¹ˆà¸­à¸§à¹ˆà¸²:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸„ัดลอà¸à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸­à¹à¸žà¸à¹€à¸à¸ˆ..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸‚ียนรายชื่อà¹à¸«à¸¥à¹ˆà¸‡à¹à¸žà¸à¹€à¸à¸ˆà¹à¸«à¸¥à¹ˆà¸‡à¹ƒà¸«à¸¡à¹ˆ\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "บรรทัดรายชื่อà¹à¸«à¸¥à¹ˆà¸‡à¹à¸žà¸à¹€à¸à¸ˆà¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸œà¹ˆà¸™à¸™à¸µà¹‰à¸„ือ:\n"
@@ -3456,6 +3447,13 @@ msgid "Not locked"
msgstr "ไม่ได้ล็อคอยู่"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "à¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰à¸ˆà¸¸à¸”เมานท์ซีดีรอม %s\n"
+#~ "à¸à¸³à¸¥à¸±à¸‡à¹€à¸¡à¸²à¸™à¸—์ซีดีรอม\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr "ไม่สามารถปรับà¹à¸à¹‰ %s ด้วย mmap à¹à¸¥à¸°à¸à¸²à¸£à¸à¸£à¸°à¸—ำà¹à¸Ÿà¹‰à¸¡ - ดูเหมือนà¹à¸žà¸•à¸Šà¹Œà¸ˆà¸°à¹€à¸ªà¸µà¸¢"
diff --git a/po/tl.po b/po/tl.po
index 180f2732e..a320e92fa 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -161,7 +161,7 @@ msgstr " Naka-Pin na Pakete: "
msgid " Version table:"
msgstr " Talaang Bersyon:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -262,12 +262,12 @@ msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'"
msgid "Please insert a Disc in the drive and press enter"
msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set."
@@ -744,12 +744,12 @@ msgstr "Hindi nahanap ang Disk."
msgid "File not found"
msgstr "Hindi Nahanap ang Talaksan"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Bigo ang pag-stat"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Bigo ang pagtakda ng oras ng pagbago"
@@ -1014,7 +1014,7 @@ msgstr ""
"Ang sumusunod na mga lagda ay hindi maberipika dahil ang public key ay hindi "
"available:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1332,108 +1332,108 @@ msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Nakaluklok]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ngunit ang %s ay nakaluklok"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ngunit ang %s ay iluluklok"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ngunit hindi ito maaaring iluklok"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ngunit ito ay birtwal na pakete"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ngunit ito ay hindi nakaluklok"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ngunit ito ay hindi iluluklok"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " o"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dahil sa %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1441,27 +1441,27 @@ msgstr ""
"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu iniluklok muli, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nai-downgrade, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
@@ -1470,7 +1470,7 @@ msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[O/h]"
@@ -1478,21 +1478,21 @@ msgstr "[O/h]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[o/H]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "O"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "H"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -1660,7 +1660,7 @@ msgstr "Hindi mabuksan ang talaksang %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Bigo sa paglikha ng IPC pipe sa subprocess"
@@ -2022,47 +2022,47 @@ msgstr "Maling anyo ng override %s linya %lu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Maling anyo ng override %s linya %lu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Hindi kilalang algorithmong compression '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Kailangan ng compression set ang compressed output %s"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Bigo ang paglikha ng FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Bigo ang pag-fork"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Anak para sa pag-Compress"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Error na internal, bigo ang paglikha ng %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Bigo ang IO sa subprocess/talaksan"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Bigo ang pagbasa habang tinutuos ang MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Problema sa pag-unlink ng %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
@@ -2198,12 +2198,12 @@ msgstr "Dobleng pagdagdag ng diversion %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "Nadobleng talaksang conf %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Bigo sa pagsulat ng talaksang %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Bigo sa pagsara ng talaksang %s"
@@ -2588,22 +2588,22 @@ msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
msgid "write, still have %llu to write but couldn't"
msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Problema sa pagsara ng talaksan"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problema sa pag-sync ng talaksan"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Problema sa pag-unlink ng talaksan"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Problema sa pag-sync ng talaksan"
@@ -2862,7 +2862,7 @@ msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Nawawala ang directory ng talaan %spartial."
@@ -3039,35 +3039,35 @@ msgstr "Di tugmang laki"
msgid "Invalid file format"
msgstr "Di tanggap na operasyon %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3075,12 +3075,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3089,12 +3089,12 @@ msgstr ""
"Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
"niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3132,51 +3132,42 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
msgid "Vendor block %s contains no fingerprint"
msgstr "Block ng nagbebenta %s ay walang fingerprint"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Ginagamit ang %s bilang mount point ng CD-ROM\n"
-"Sinasalang ang CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Kinikilala..."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Naka-imbak na Label: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "Ina-unmount ang CD-ROM..."
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Ina-unmount ang CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Hinihintay ang disc...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Sinasalang ang CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Kinikilala..."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Naka-imbak na Label: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "Ina-unmount ang CD-ROM..."
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Sinisiyasat ang Disc para sa talaksang index...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, fuzzy, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3185,22 +3176,22 @@ msgstr ""
"Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
"signature\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, fuzzy, c-format
msgid "Found label '%s'\n"
msgstr "Naka-imbak na Label: %s \n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Hindi yan tanggap na pangalan, subukan muli.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3209,15 +3200,15 @@ msgstr ""
"Ang Disc na ito ay nagngangalang: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Kinokopya ang Listahan ng mga Pakete"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
@@ -3502,6 +3493,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Ginagamit ang %s bilang mount point ng CD-ROM\n"
+#~ "Sinasalang ang CD-ROM\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
diff --git a/po/tr.po b/po/tr.po
index b1bb0f17d..0ea96fe86 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -159,7 +159,7 @@ msgstr " Paket sabitleme: "
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-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -255,12 +255,12 @@ msgstr "Lütfen bu CD/DVD'ye bir isim verin, örneğin 'Debian 5.0.3 Disk 1'"
msgid "Please insert a Disc in the drive and press enter"
msgstr "Lütfen sürücüye bir Disk yerleştirin ve giriş tuşuna (Enter) basın"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "'%s', '%s' konumuna bağlanamadı"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Kalan CD'leriniz için bu işlemi yineleyin."
@@ -770,12 +770,12 @@ msgstr "Disk bulunamadı."
msgid "File not found"
msgstr "Dosya bulunamadı"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Durum bilgisi okunamadı"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Değişiklik zamanı ayarlanamadı"
@@ -1034,7 +1034,7 @@ msgid ""
"available:\n"
msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değil:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar"
@@ -1358,108 +1358,108 @@ msgstr "Paketler doÄŸrulanmadan kurulsun mu?"
msgid "Failed to fetch %s %s\n"
msgstr "%s ağdan alınamadı. %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Kuruldu]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ama %s kurulu"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ama %s kurulacak"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ama kurulabilir deÄŸil"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ama o bir sanal paket"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ama kurulu deÄŸil"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ama kurulmayacak"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " ya da"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Aşağıdaki YENİ paketler kurulacak:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Aşağıdaki paketler KALDIRILACAK:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Aşağıdaki paketler yükseltilecek:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s nedeniyle) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1467,27 +1467,27 @@ msgstr ""
"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu paket yeniden kurulacak, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu paketin sürümü düşürülecek, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
@@ -1496,7 +1496,7 @@ msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[E/h]"
@@ -1504,21 +1504,21 @@ msgstr "[E/h]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[e/H]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "E"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "H"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex derleme hatası - %s"
@@ -1692,7 +1692,7 @@ msgstr "Yansı dosyası %s okunamıyor"
msgid "[Mirror: %s]"
msgstr "[Yansı: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Altsürece IPC borusu oluşturulamadı"
@@ -2051,47 +2051,47 @@ msgstr "Hatalı geçersiz kılma %s satır %llu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Hatalı geçersiz kılma %s satır %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Bilinmeyen sıkıştırma algoritması '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Sıkıştırılmış %s çıktısı bir sıkıştırma kümesine ihtiyaç duymaktadır."
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "DOSYA* oluşturulamadı"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "fork yapılamadı"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Çocuğu sıkıştır"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "İç hata, %s oluşturulamadı"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Altsürece/dosyaya GÇ işlemi başarısız oldu"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "MD5 hesaplanırken okunamadı"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "%s bağı koparılırken sorun çıktı"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "%s, %s olarak yeniden adlandırılamadı"
@@ -2227,12 +2227,12 @@ msgstr "Aynı dosya iki kez yönlendirilemez: %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "%s/%s yapılandırma dosyası zaten mevcut"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "%s dosyasına yazılamadı"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "%s dosyası kapatılamadı"
@@ -2620,22 +2620,22 @@ msgstr "read, %llu bayt okunması gerekli fakat hiç kalmamış"
msgid "write, still have %llu to write but couldn't"
msgstr "write, yazılması gereken %llu bayt yazılamıyor"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "%s dosyası kapatılamadı"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "%s dosyası %s olarak yeniden adlandırılamadı"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "%s dosyasından bağ kaldırma sorunu"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Dosya eşitlenirken sorun çıktı"
@@ -2905,7 +2905,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Liste dizini %spartial bulunamadı."
@@ -3079,7 +3079,7 @@ msgstr "Boyutlar eÅŸleÅŸmiyor"
msgid "Invalid file format"
msgstr "Geçersiz işlem: %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3088,17 +3088,17 @@ msgstr ""
"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
"dosyasındaki girdi ya da satır hatalı)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3107,12 +3107,12 @@ msgstr ""
"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
"güncelleştirmeleri uygulanmayacak."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3122,12 +3122,12 @@ msgstr ""
"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hatası: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3136,12 +3136,12 @@ msgstr ""
"%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle "
"düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3177,50 +3177,41 @@ msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
msgid "Vendor block %s contains no fingerprint"
msgstr "Sağlayıcı bloğu %s parmak izi içermiyor"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"CD-ROM bağlama noktası %s kullanılıyor\n"
-"CD-ROM bağlanıyor\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Tanımlanıyor... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Kayıtlı etiket: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM ayrılıyor...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "CD-ROM bağlama noktası %s kullanılıyor\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "CD-ROM ayrılıyor\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Disk bekleniliyor...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "CD-ROM bağlanıyor...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Tanımlanıyor... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Kayıtlı etiket: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM ayrılıyor...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Disk, indeks dosyaları için taranıyor..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3229,7 +3220,7 @@ msgstr ""
"%zu paket indeksi, %zu kaynak indeksi, %zu çeviri indeksi ve %zu imza "
"bulundu\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3237,16 +3228,16 @@ msgstr ""
"Hiç paket dosyası bulunamadı. Belirttiğiniz disk bir Debian diski değil ya "
"da yanlış mimariye sahip."
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "'%s' etiketi bulundu\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Bu, geçerli bir ad değil, yeniden deneyin.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3255,15 +3246,15 @@ msgstr ""
"Disk adı: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Paket listeleri kopyalanıyor.."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Yeni kaynak listesi yazılıyor\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Bu disk için olan kaynak listesi girdileri:\n"
@@ -3561,6 +3552,13 @@ msgid "Not locked"
msgstr "KilitlenmemiÅŸ"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "CD-ROM bağlama noktası %s kullanılıyor\n"
+#~ "CD-ROM bağlanıyor\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 7f7f094c3..c089d5fac 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -164,7 +164,7 @@ msgstr " ФікÑатор(pin) пакунка: "
msgid " Version table:"
msgstr " Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð²ÐµÑ€Ñій:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -258,12 +258,12 @@ msgstr "Задайте назву Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ДиÑка, наприкла
msgid "Please insert a Disc in the drive and press enter"
msgstr "Будь-лаÑка, вÑтавте ДиÑк у приÑтрій Ñ– натиÑніть Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Ðе вдалоÑÑ Ð¿Ñ–Ð´'єднати '%s' до '%s'"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Повторіть цей Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð´Ð»Ñ Ñ€ÐµÑˆÑ‚Ð¸ CD з вашого набору."
@@ -781,13 +781,13 @@ msgstr "ДиÑк не знайдено."
msgid "File not found"
msgstr "Файл не знайдено"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
#, fuzzy
msgid "Failed to stat"
msgstr "Ðе вдалоÑÑ Ð¾Ð´ÐµÑ€Ð¶Ð°Ñ‚Ð¸ атрибути (stat)"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Ðе вдалоÑÑ Ð²Ñтановити Ñ‡Ð°Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
@@ -1050,7 +1050,7 @@ msgstr ""
"ÐаÑтупні підпиÑи не можуть бути перевірені, тому що публічний ключ "
"відÑутній:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "ПуÑÑ‚Ñ– файли не можуть бути правильними архівами"
@@ -1379,108 +1379,108 @@ msgstr "Ð’Ñтановити ці пакунки без перевірки?"
msgid "Failed to fetch %s %s\n"
msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Ð’Ñтановлено]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Ð’Ñтановлено]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Ð’Ñтановлено]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Ð’Ñтановлено]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Пакунки, що мають незадоволені залежноÑÑ‚Ñ–:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "але %s вже вÑтановлений"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "але %s буде вÑтановлений"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "але він не може бути вÑтановлений"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "але це віртуальний пакунок"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "але він не вÑтановлений"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "але він не буде вÑтановлений"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " чи"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "ÐОВІ пакунки, Ñкі будуть вÑтановлені:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Пакунки, Ñкі будуть ВИДÐЛЕÐІ:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Пакунки, Ñкі залишені в незмінному Ñтані:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Пакунки, Ñкі будуть ОÐОВЛЕÐІ:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Пакунки, Ñкі будуть замінені на СТÐРІШІ верÑÑ–Ñ—:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Пакунки, Ñкі мали б залишитиÑÑ Ð±ÐµÐ· змін, але будуть замінені:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (внаÑлідок %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1488,27 +1488,27 @@ msgstr ""
"УВÐГÐ: ÐаÑтупні важливі пакунки будуть вилучені.\n"
"ÐЕ РОБІТЬ цього, Ñкщо ви ÐЕ уÑвлÑєте Ñобі вÑÑ– можливі наÑлідки!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "оновлено %lu, вÑтановлено %lu нових, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu перевÑтановлено, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu замінено на Ñтаріші верÑÑ–Ñ—, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu відмічено Ð´Ð»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ– %lu не оновлено.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "не вÑтановлено(видалено) до ÐºÑ–Ð½Ñ†Ñ %lu пакунків.\n"
@@ -1517,7 +1517,7 @@ msgstr "не вÑтановлено(видалено) до ÐºÑ–Ð½Ñ†Ñ %lu пак
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1525,21 +1525,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Помилка компілÑції регулÑрного виразу - %s"
@@ -1713,7 +1713,7 @@ msgstr "Ðеможливо прочитати файл дзеркала '%s'"
msgid "[Mirror: %s]"
msgstr "[Дзеркало: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Ðе вдалоÑÑ Ñтворити IPC канал Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¿Ñ€Ð¾Ñ†ÐµÑу"
@@ -2079,47 +2079,47 @@ msgstr "Спотворений Ð·Ð°Ð¿Ð¸Ñ Ð¿Ñ€Ð¾ перепризначеннÑ
msgid "Malformed override %s line %llu #3"
msgstr "Спотворений Ð·Ð°Ð¿Ð¸Ñ Ð¿Ñ€Ð¾ Ð¿ÐµÑ€ÐµÐ¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ (override) %s на Ñ€Ñдку %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Ðевідомий алгоритм ÑтиÑÐ½ÐµÐ½Ð½Ñ '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ ÑтиÑнутого виводу %s необхідно ввімкнути ÑтиÑненнÑ"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Ðе вдалоÑÑ Ñтворити FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Ðе вдалоÑÑ Ð¿Ð¾Ñ€Ð¾Ð´Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ†ÐµÑ (fork)"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "ПроцеÑ-нащадок, що виконує пакуваннÑ"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, не вдалоÑÑ Ñтворити %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Помилка уведеннÑ/виводу в підпроцеÑ/файл"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Помилка Ð·Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð¾Ð±Ñ‡Ð¸ÑÐ»ÐµÐ½Ð½Ñ MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ %s на %s"
@@ -2258,12 +2258,12 @@ msgstr "Подвійне Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ diversion %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "ÐšÐ¾Ð¿Ñ–Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ð¹Ð½Ð¾Ð³Ð¾ файлу %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Ðе вдалоÑÑ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ файл %s"
@@ -2655,22 +2655,22 @@ msgstr "зчитуваннÑ, повинен зчитати ще %llu байт,
msgid "write, still have %llu to write but couldn't"
msgstr "запиÑуваннÑ, повинен був запиÑати ще %llu байт, але не вдалоÑÑ"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Проблема з закриттÑм файла %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Проблема з перейменуваннÑм файла %s на %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Проблема з роз'єднаннÑм файла %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Проблема з Ñинхронізацією файла"
@@ -2929,7 +2929,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ðеможливо уÑунути проблеми, ви маєте поламані зафікÑовані пакунки."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "ВідÑÑƒÑ‚Ð½Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ñ–Ñ Ð·Ñ– ÑпиÑками: %spartial"
@@ -3102,7 +3102,7 @@ msgstr "ÐевідповідніÑÑ‚ÑŒ розміру"
msgid "Invalid file format"
msgstr "Ðевірна Ð´Ñ–Ñ %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3111,16 +3111,16 @@ msgstr ""
"Ðеможливо знайти очікуваний Ð·Ð°Ð¿Ð¸Ñ '%s' у 'Release' файлі (Ðевірний Ð·Ð°Ð¿Ð¸Ñ Ñƒ "
"sources.list, або пошкоджений файл)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ðеможливо знайти хеш-Ñуму Ð´Ð»Ñ '%s' у 'Release' файлі"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "ВідÑутній публічний ключ Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ… ідентифікаторів (ID) ключа:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3129,12 +3129,12 @@ msgstr ""
"Файл 'Release' Ð´Ð»Ñ %s заÑтарів (недійÑний з %s). ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ "
"Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ Ð½Ðµ будуть заÑтоÑовані."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфліктуючий диÑтрибутив: %s (очікувавÑÑ %s, але Ñ” %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3144,12 +3144,12 @@ msgstr ""
"попередні індекÑні файли будуть викориÑтані. Помилка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Помилка GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3158,12 +3158,12 @@ msgstr ""
"Я не зміг знайти файл Ð´Ð»Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÑƒ %s. Можливо, це значить, що вам потрібно "
"влаÑноруч виправити цей пакунок. (через відÑутніÑÑ‚ÑŒ 'arch')"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Ðеможливо знайти джерело Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²ÐµÑ€ÑÑ–Ñ— '%s' Ð´Ð»Ñ '%s'"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3200,50 +3200,41 @@ msgstr "Ðевірний Ð·Ð°Ð¿Ð¸Ñ 'Date' у 'Release' файлі %s"
msgid "Vendor block %s contains no fingerprint"
msgstr "Блок поÑтачальника %s не міÑтить відбитку (fingerprint)"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"ВикориÑтовуєтьÑÑ Ñ‚Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ CD-ROM: %s\n"
-"МонтуєтьÑÑ CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "ІдентифікаціÑ.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "ЗапиÑано мітку: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "ДемонтуєтьÑÑ CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "ВикориÑтовуєтьÑÑ Ñ‚Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ CD-ROM: %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "ДемонтуєтьÑÑ CD-ROM\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Чекаю на диÑк...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "МонтуєтьÑÑ CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "ІдентифікаціÑ.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "ЗапиÑано мітку: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "ДемонтуєтьÑÑ CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "СкануєтьÑÑ Ð´Ð¸Ñк на вміÑÑ‚ індекÑних файлів..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3252,7 +3243,7 @@ msgstr ""
"Знайдено %zu індекÑів пакунків, %zu індекÑів вихідних текÑтів, %zu індекÑів "
"перекладів Ñ– %zu підпиÑів\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3260,16 +3251,16 @@ msgstr ""
"Ðеможливо знайти ніÑкі файли пакунків, можливо, що це не диÑк з Debian, або "
"невірна архітектура?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Знайдено мітку: '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Ðе Ñ” вірною назвою, Ñпробуйте ще.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3278,15 +3269,15 @@ msgstr ""
"Цей диÑк зветьÑÑ: \n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "КопіюютьÑÑ Ð¿ÐµÑ€ÐµÐ»Ñ–ÐºÐ¸ пакунків..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "ЗапиÑуєтьÑÑ Ð½Ð¾Ð²Ð¸Ð¹ перелік вихідних текÑтів\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "Перелік вихідних текÑтів Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ диÑка:\n"
@@ -3598,6 +3589,13 @@ msgid "Not locked"
msgstr "Ðе заблоковано"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "ВикориÑтовуєтьÑÑ Ñ‚Ð¾Ñ‡ÐºÐ° Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ CD-ROM: %s\n"
+#~ "МонтуєтьÑÑ CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 8d2b4fac3..a4941fe3f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.9.14.2\n"
+"Project-Id-Version: apt 0.9.15.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-06 20:46+0100\n"
-"PO-Revision-Date: 2014-01-01 13:45+0700\n"
+"POT-Creation-Date: 2014-02-13 10:19+0100\n"
+"PO-Revision-Date: 2014-02-10 07:50+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"
@@ -161,13 +161,13 @@ msgstr " Ghim gói: "
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-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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"
-msgstr "%s %s dành cho %s được biên dịch vào %s %s\n"
+msgstr "%s-%s được biên dịch cho %s vào lúc “%s %sâ€\n"
#: cmdline/apt-cache.cc:1740
msgid ""
@@ -233,14 +233,14 @@ msgstr ""
" policy - Hiển thị các cài đặt chính sách\n"
"\n"
"Tùy chá»n:\n"
-" -h Trợ giúp này.\n"
+" -h Hiển thị trợ giúp này.\n"
" -p=? Bộ nhớ tạm gói.\n"
" -s=? Bộ nhớ tạm nguồn.\n"
-" -q Không hiển thị diễn tiến.\n"
+" -q Không hiển thị diễn tiến công việc.\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"
-"Äể tìm thông tin thêm, xem hai trang man (hÆ°á»›ng dẫn)\n"
+"Äể tìm thông tin thêm, xem hai trang hÆ°á»›ng dẫn\n"
" apt-cache(8) và apt.conf(5).\n"
#. }}}
@@ -257,18 +257,18 @@ msgstr ""
#: cmdline/apt-cdrom.cc:89
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Hãy cung cấp tên cho ÄÄ©a này, ví dụ nhÆ° là: “Debian 5.0.3 ÄÄ©a 1â€"
+msgstr "Hãy cung cấp tên cho ÄÄ©a này, kiểu nhÆ° là: “Debian 5.0.3 ÄÄ©a 1â€"
#: cmdline/apt-cdrom.cc:104
msgid "Please insert a Disc in the drive and press enter"
-msgstr "Hãy đưa đĩa vào ổ và bấm nút Enter"
+msgstr "Hãy đưa đĩa vào ổ rồi bấm nút Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Gặp lá»—i khi gắn “%s†vào “%sâ€"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Hãy lặp lại tiến trình này cho các ÄÄ©a còn lại trong bá»™ Ä‘Ä©a của bạn."
@@ -687,11 +687,10 @@ 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ó cần quyá»n siêu ngÆ°á»i dùng (root) để làm "
-"việc này"
+"Thá»±c thi lệnh “dpkg†gặp lá»—i. Bạn có cần quyá»n siêu ngÆ°á»i dùng để thá»±c thi "
+"lệnh này"
#: cmdline/apt-mark.cc:381
-#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -726,6 +725,11 @@ msgstr ""
"Lệnh:\n"
" auto - Äánh dấu các gói Ä‘Æ°a ra là được cài đặt tá»± Ä‘á»™ng\n"
" manual - Äánh dấu các gói Ä‘Æ°a ra là được cài đặt bằng tay\n"
+" hold - Äánh dấu má»™t gói là giữ lại\n"
+" unhold - BỠđánh dấu một gói là giữ lại\n"
+" showauto - In ra danh sách các gói được tự động cài đặt\n"
+" showmanual - In ra danh sách các gói được cài đặt bằng tay\n"
+" showhold - In ra danh sách các gói được giữ lại\n"
"\n"
"Tùy chá»n:\n"
" -h Trợ giúp này.\n"
@@ -739,7 +743,6 @@ msgstr ""
" apt-mark(8) và apt.conf(5)"
#: cmdline/apt.cc:71
-#, fuzzy
msgid ""
"Usage: apt [options] command\n"
"\n"
@@ -768,8 +771,13 @@ msgstr ""
" 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"
+"\n"
" install - cài đặt các gói\n"
+" remove - gỡ bỠcác gói\n"
+"\n"
" upgrade - nâng cấp các gói trong hệ thống\n"
+" full-upgrade - nâng cấp hệ thống bằng cách gỡ bá», cài đặt, nâng cấp các "
+"gói\n"
"\n"
" edit-sources - sửa tập tin thông tin gói nguồn\n"
@@ -803,12 +811,12 @@ msgstr "Không tìm thấy đĩa."
msgid "File not found"
msgstr "Không tìm thấy tập tin"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Gặp lỗi khi lấy thống kê"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Gặp lỗi khi đặt giỠsửa đổi"
@@ -1071,7 +1079,7 @@ msgid ""
msgstr ""
"Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn có:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ"
@@ -1389,105 +1397,105 @@ msgstr "Cài đặt những gói này mà không cần thẩm tra?"
msgid "Failed to fetch %s %s\n"
msgstr "Gặp lỗi khi lấy vỠ%s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
-msgstr ""
+msgstr "không hiểu"
-#: apt-private/private-output.cc:198
-#, fuzzy, c-format
+#: apt-private/private-output.cc:201
+#, c-format
msgid "[installed,upgradable to: %s]"
-msgstr "đã cài, có thể nâng cấp thành: "
+msgstr "[đã cài, có thể nâng cấp thành: %s]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
msgid "[installed,local]"
msgstr "[đã cài đặt,nội bộ]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
-msgstr "[đã cài, có thể tá»± Ä‘á»™ng gỡ bá»]"
+msgstr "[đã cài,có thể tá»± Ä‘á»™ng gỡ bá»]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
msgid "[installed,automatic]"
msgstr "[đã cài đặt,tự động]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
msgid "[installed]"
msgstr "[đã cài đặt]"
-#: apt-private/private-output.cc:213
-#, fuzzy, c-format
+#: apt-private/private-output.cc:216
+#, c-format
msgid "[upgradable from: %s]"
-msgstr "[có thể nâng cấp từ: "
+msgstr "[có thể nâng cấp từ: %s]"
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr "[residual-config]"
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Những gói theo đây chÆ°a thá»a mãn quan hệ phụ thuá»™c:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "nhưng mà %s đã được cài đặt"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "nhưng mà %s sẽ được cài đặt"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "nhưng mà nó không có khả năng cài đặt"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "nhưng mà nó là gói ảo"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "nhưng mà nó không được cài đặt"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "nhưng mà nó sẽ không được cài đặt"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " hay"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
-msgstr "Những gói MỚI sau sẽ được cài đặt:"
+msgstr "Những gói MỚI sau sẽ được CÀI ÄẶT:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Những gói sau sẽ bị GỠ BỎ:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "Những gói sau đây được giữ lại:"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
-msgstr "Những gói sau đây sẽ được thay đổi:"
+msgstr "Những gói giữ lại sau đây sẽ bị THAY Äá»”I:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (bởi vì %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1495,27 +1503,27 @@ msgstr ""
"CẢNH BÃO: Có những gói chủ yếu sau đây sẽ bị gỡ bá».\n"
"ÄỪNG làm nhÆ° thế trừ khi bạn biết chính xác mình Ä‘ang làm gì!"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nâng cấp, %lu được cài đặt mới, "
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu được cài đặt lại, "
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu bị hạ cấp, "
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu cần gỡ bá», và %lu chÆ°a được nâng cấp.\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu chÆ°a được cài đặt toàn bá»™ hay được gỡ bá».\n"
@@ -1524,7 +1532,7 @@ msgstr "%lu chÆ°a được cài đặt toàn bá»™ hay được gỡ bá».\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr "[C/k]"
@@ -1532,21 +1540,21 @@ msgstr "[C/k]"
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr "[c/K]"
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "C"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr "K"
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dịch biểu thức chính quy - %s"
@@ -1608,7 +1616,7 @@ msgstr "Tìm kiếm toàn văn"
msgid "There is %lu additional record. Please use the '-a' switch to see it"
msgid_plural ""
"There are %lu additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
+msgstr[0] "Ở đây có %lu bản ghi phụ thêm. Hãy dùng tùy chá»n “-a†để xem"
#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
@@ -1621,10 +1629,10 @@ msgid ""
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
-"GHI CHÚ: đây chỉ là mô phá»ng!\n"
-" apt-get yêu cầu quyá»n root để thá»±c hiện thật.\n"
-" Cần nhớ rằng chức năng khóa đã bị tắt,\n"
-" nên có thể nó không chính xác như những gì làm thật!"
+"CHÚ Ã: đây chỉ là mô phá»ng!\n"
+" apt-get yêu cầu quyá»n root để thá»±c hiện thật.\n"
+" Cần nhớ rằng chức năng khóa đã bị tắt,\n"
+" nên có thể nó không chính xác như những gì làm thật!"
#: apt-private/private-sources.cc:45
#, c-format
@@ -1697,26 +1705,26 @@ 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 bản sao “%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 bản sao “%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 bản sao “%sâ€"
#: methods/mirror.cc:445
#, c-format
msgid "[Mirror: %s]"
msgstr "[Bản sao: %s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
@@ -1939,7 +1947,7 @@ msgstr "CÆ¡ sở dữ liệu bị há»ng nên đã đổi tên tập tin thành
#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s"
+msgstr "Cơ sở dữ liệu đã cũ, nên đang cố nâng cấp lên thành %s"
#: ftparchive/cachedb.cc:76
msgid ""
@@ -2002,7 +2010,7 @@ msgstr "Việc di chuyển qua cây bị lỗi"
#: ftparchive/writer.cc:210
#, c-format
msgid "Failed to open %s"
-msgstr "Việc mở %s bị lỗi"
+msgstr "Gặp lỗi khi mở %s"
#: ftparchive/writer.cc:269
#, c-format
@@ -2065,9 +2073,9 @@ msgstr "Không thể mở %s"
#. skip spaces
#. find end of word
#: ftparchive/override.cc:65
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu (%s)"
-msgstr "Sai override %s dòng %llu #1"
+msgstr "Sai “override†%s dòng %llu (%s)"
#: ftparchive/override.cc:124 ftparchive/override.cc:198
#, c-format
@@ -2089,47 +2097,47 @@ msgstr "Sai override %s dòng %llu #2"
msgid "Malformed override %s line %llu #3"
msgstr "Sai override %s dòng %llu #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Không biết thuật toán nén “%sâ€"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Việc tạo TẬP_TIN* bị lỗi"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Gặp lỗi khi rẽ nhánh tiến trình"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "Nén con"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "Lỗi nội bộ, gặp lỗi khi tạo %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Gặp lỗi khi nhập/xuất vào tiến-trình-con/tập-tin"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Gặp lá»—i khi Ä‘á»c trong khi tính MD5"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Gặp lỗi khi bỠliên kết %s"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Việc đổi tên %s thành %s bị lỗi"
@@ -2203,7 +2211,7 @@ msgstr "Kho bị há»ng."
#: apt-inst/contrib/extracttar.cc:195
msgid "Tar checksum failed, archive corrupted"
-msgstr "Lá»—i kiểm tổng tar, kho bị há»ng"
+msgstr "Gặp lá»—i khi tổng kiểm “tarâ€, kho bị há»ng"
#: apt-inst/contrib/extracttar.cc:300
#, c-format
@@ -2266,12 +2274,12 @@ msgstr "Sự trệch đi được thêm hai lần %s → %s"
msgid "Duplicate conf file %s/%s"
msgstr "Tập tin cấu hình (conf) trùng lặp %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "Việc ghi tập tin %s gặp lỗi"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Việc đóng tập tin %s gặp lỗi"
@@ -2657,22 +2665,22 @@ msgstr "Ä‘á»c, còn cần Ä‘á»c %llu nhÆ°ng mà không có gì còn lại cả
msgid "write, still have %llu to write but couldn't"
msgstr "ghi, còn cần ghi %llu nhưng mà không thể"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "Gặp vấn đỠkhi đóng tập tin %s"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gặp vấn đỠkhi đổi tên tập tin %s thành %s"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "Gặp vấn đỠkhi bỠliên kết tập tin %s"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Gặp vấn đỠkhi đồng bộ hóa tập tin"
@@ -2800,9 +2808,9 @@ msgid "Unable to parse package file %s (2)"
msgstr "Không thể phân tích tập tin gói %s (2)"
#: apt-pkg/sourcelist.cc:118
-#, fuzzy, c-format
+#, c-format
msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
+msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)"
#: apt-pkg/sourcelist.cc:161
#, c-format
@@ -2884,9 +2892,9 @@ msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Không biết kiểu “%s†trên dòng %u trong danh sách nguồn %s."
#: apt-pkg/sourcelist.cc:407
-#, fuzzy, c-format
+#, c-format
msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Không biết kiểu “%s†trên dòng %u trong danh sách nguồn %s."
+msgstr "Không hiểu kiểu “%s†trên đoạn %u trong danh sách nguồn %s"
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
@@ -2937,7 +2945,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "Không thể sá»­a trục trặc này, bạn đã giữ lại má»™t số gói bị há»ng."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "Thiếu thư mục danh sách %spartial."
@@ -3111,7 +3119,7 @@ msgstr "Kích cỡ không khớp nhau"
msgid "Invalid file format"
msgstr "Äịnh dạng tập tập tin không hợp lệ"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3120,16 +3128,16 @@ msgstr ""
"Không tìm thấy mục cần thiết “%s†trong tập tin Phát hành (Sai mục trong "
"sources.list hoặc tập tin bị há»ng)"
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "Không có khóa công sẵn sàng cho những mã số khoá theo đây:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -3138,12 +3146,12 @@ msgstr ""
"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho "
"này sẽ không được áp dụng."
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3154,12 +3162,12 @@ msgstr ""
"Lá»—i GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "Lá»—i GPG: %s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3168,12 +3176,12 @@ msgstr ""
"Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói "
"này, do thiếu kiến trúc."
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, 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â€"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3200,64 +3208,55 @@ msgstr "Không có mục Hash (chuá»—i duy nhất) nào trong tập tin Phát hÃ
#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-"Gặp mục nhập “Valid-Until†(hợp lệ đến khi) không hợp lệ trong tập tin Phát "
+"Gặp mục tin “Valid-Until†(hợp lệ đến khi) không hợp lệ trong tập tin Phát "
"hành %s"
#: apt-pkg/indexrecords.cc:144
#, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
-"Gặp mục nhập “Date†(ngày tháng) không hợp lệ trong tập tin Phát hành %s"
+"Gặp mục tin “Date†(ngày tháng) không hợp lệ trong tập tin Phát hành %s"
#: apt-pkg/vendorlist.cc:78
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Khối nhà bán %s không chứa vân tay"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Äang dùng thÆ° mục gắn Ä‘Ä©a CD-ROM %s\n"
-"Äang gắn Ä‘Ä©a CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Äang nhận diện... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Nhãn đã lưu: %s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Äang bá» gắn CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "Äang dùng Ä‘iểm gắn Ä‘Ä©a CD-ROM %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "Äang bá» gắn CD-ROM...\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "Äang đợi Ä‘Ä©a...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "Äang gắn Ä‘Ä©a CD-ROM...\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Äang nhận diện... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Nhãn đã lưu: %s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Äang bá» gắn CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "Äang quét Ä‘Ä©a tìm tập tin chỉ mục...\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3265,7 +3264,7 @@ msgid ""
msgstr ""
"Tìm thấy %zu chỉ mục gói, %zu chỉ mục nguồn, %zu chỉ mục dịch và %zu chữ ký\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3273,16 +3272,16 @@ msgstr ""
"Không tìm thấy tập tin gói nào, có thể vì đây không phải là má»™t ÄÄ©a Debian, "
"hoặc có kiến trúc không đúng?"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "Tìm thấy nhãn “%sâ€\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3291,17 +3290,17 @@ msgstr ""
"Tên đĩa này:\n"
"“%sâ€\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "Äang sao chép các danh sách gói..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "Äang ghi danh sách nguồn má»›i\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
-msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
+msgstr "Các mục tin danh sách nguồn cho đĩa này:\n"
#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
#, c-format
@@ -3506,7 +3505,7 @@ msgstr "Gỡ bỠhoàn toàn %s"
#: apt-pkg/deb/dpkgpm.cc:1046
msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
+msgstr "ioctl(TIOCGWINSZ) gặp lỗi"
#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
#, c-format
@@ -3528,7 +3527,7 @@ msgstr "Hệ Ä‘iá»u hành đã ngắt trÆ°á»›c khi nó kịp hoàn thành"
#: apt-pkg/deb/dpkgpm.cc:1620
msgid "No apport report written because MaxReports is reached already"
msgstr ""
-"Không ghi báo cáo apport, vì đã tới giới hạn số các báo cáo (MaxReports)"
+"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)"
#. check if its not a follow up error
#: apt-pkg/deb/dpkgpm.cc:1625
@@ -3601,6 +3600,13 @@ msgid "Not locked"
msgstr "Chưa được khoá"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Äang dùng thÆ° mục gắn Ä‘Ä©a CD-ROM %s\n"
+#~ "Äang gắn Ä‘Ä©a CD-ROM...\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3b3e10554..7a97e6305 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
@@ -156,7 +156,7 @@ msgstr " 软件包é”:"
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -254,12 +254,12 @@ msgstr "请给这张盘片起个å字,比如“Debian 5.0.3 Disk 1â€"
msgid "Please insert a Disc in the drive and press enter"
msgstr "请把盘片æ’入驱动器å†æŒ‰å›žè½¦é”®"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "无法将 %s 挂载到 %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "请对您的盘片套件中的其它盘片é‡å¤ç›¸åŒçš„æ“作。"
@@ -736,12 +736,12 @@ msgstr "找ä¸åˆ°ç›˜ç‰‡ã€‚"
msgid "File not found"
msgstr "无法找到该文件"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "无法读å–状æ€"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -999,7 +999,7 @@ msgid ""
"available:\n"
msgstr "由于没有公钥,无法验è¯ä¸‹åˆ—ç­¾å:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1303,108 +1303,108 @@ msgstr "ä¸ç»éªŒè¯å°±å®‰è£…这些软件包å—?"
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [已安装]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "下列软件包有未满足的ä¾èµ–关系:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "但是 %s å·²ç»å®‰è£…"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "但是 %s æ­£è¦è¢«å®‰è£…"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "但无法安装它"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "但是它是虚拟软件包"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "但是它还没有被安装"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "但是它将ä¸ä¼šè¢«å®‰è£…"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " 或"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "下列ã€æ–°ã€‘软件包将被安装:"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "下列软件包将被ã€å¸è½½ã€‘:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "下列软件包的版本将ä¿æŒä¸å˜ï¼š"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "下列软件包将被å‡çº§ï¼š"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "下列软件包将被ã€é™çº§ã€‘:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "下列被è¦æ±‚ä¿æŒç‰ˆæœ¬ä¸å˜çš„软件包将被改å˜ï¼š"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (是由于 %s) "
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1412,27 +1412,27 @@ msgstr ""
"ã€è­¦å‘Šã€‘:下列基础软件包将被å¸è½½ã€‚\n"
"请勿å°è¯•ï¼Œé™¤éžæ‚¨ç¡®å®žçŸ¥é“您在åšä»€ä¹ˆï¼"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "å‡çº§äº† %lu 个软件包,新安装了 %lu 个软件包,"
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "é‡æ–°å®‰è£…了 %lu 个软件包,"
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "é™çº§äº† %lu 个软件包,"
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "è¦å¸è½½ %lu 个软件包,有 %lu 个软件包未被å‡çº§ã€‚\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "有 %lu 个软件包没有被完全安装或å¸è½½ã€‚\n"
@@ -1441,7 +1441,7 @@ msgstr "有 %lu 个软件包没有被完全安装或å¸è½½ã€‚\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1449,21 +1449,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达å¼æ—¶å‡ºé”™ - %s"
@@ -1633,7 +1633,7 @@ msgstr "没有找到镜åƒæ–‡ä»¶ %s"
msgid "[Mirror: %s]"
msgstr "[é•œåƒï¼š%s]"
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "无法为å­è¿›ç¨‹åˆ›å»º IPC 管é“"
@@ -1983,47 +1983,47 @@ msgstr "override 文件 %s 第 %lu 行的格å¼æœ‰è¯¯ #2"
msgid "Malformed override %s line %llu #3"
msgstr "override 文件 %s 第 %lu 行的格å¼æœ‰è¯¯ #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "未知的压缩算法“%sâ€"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "压缩åŽçš„输出文件 %s è¦æ±‚有一个压缩文件集åˆ"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "无法创建 FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "无法 fork"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "压缩å­è¿›ç¨‹"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "内部错误,无法创建 %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "无法对å­è¿›ç¨‹æˆ–文件进行读写"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "在计算 MD5 校验和时无法读å–æ•°æ®"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "在使用 unlink 删除 %s 时出错"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "无法将 %s é‡å‘½å为 %s"
@@ -2158,12 +2158,12 @@ msgstr "添加了两个转移项 %s-> %s"
msgid "Duplicate conf file %s/%s"
msgstr "é‡å¤çš„é…置文件 %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "无法写入文件 %s"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "无法关闭文件 %s"
@@ -2540,22 +2540,22 @@ msgstr "读å–文件出错,还剩 %lu 字节没有读出"
msgid "write, still have %llu to write but couldn't"
msgstr "写入文件出错,还剩 %lu 字节没有ä¿å­˜"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, c-format
msgid "Problem closing the file %s"
msgstr "关闭文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr "é‡å‘½å文件 %s 为 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, c-format
msgid "Problem unlinking the file %s"
msgstr "用 unlink 删除文件 %s 出错"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "åŒæ­¥æ–‡ä»¶å‡ºé”™"
@@ -2813,7 +2813,7 @@ msgstr ""
"无法修正错误,因为您è¦æ±‚æŸäº›è½¯ä»¶åŒ…ä¿æŒçŽ°çŠ¶ï¼Œå°±æ˜¯å®ƒä»¬ç ´å了软件包间的ä¾èµ–å…³"
"系。"
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, c-format
msgid "List directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 缺失。"
@@ -2982,35 +2982,35 @@ msgstr "大å°ä¸ç¬¦"
msgid "Invalid file format"
msgstr "无效的æ“作 %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "无法解æžè½¯ä»¶åŒ…仓库 Release 文件 %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有å¯ç”¨çš„公钥:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲çªçš„å‘行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3019,12 +3019,12 @@ msgstr ""
"校验签å出错。此仓库未被更新,ä»ç„¶ä½¿ç”¨ä»¥å‰çš„索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3033,12 +3033,12 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这ç§æƒ…况下å¯èƒ½éœ€è¦æ‚¨æ‰‹åŠ¨ä¿®æ­£è¿™ä¸ªè½¯ä»¶"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3074,50 +3074,41 @@ msgstr "软件包仓库 Release 文件 %s 内 Date æ¡ç›®æ— æ•ˆ"
msgid "Vendor block %s contains no fingerprint"
msgstr "软件æ供者数æ®å—内 %s 没有包å«æŒ‡çº¹ä¿¡æ¯"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"现把 %s 作为了 CD-ROM 的挂载点\n"
-"正在挂载 CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "正在鉴别.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "已归档文件的标签:%s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "正在å¸è½½ CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "现把 %s 作为了 CD-ROM 的挂载点\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "正在å¸è½½ CD-ROM 文件系统\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "等待æ’入盘片……\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "正在挂载 CD-ROM 文件系统……\n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "正在鉴别.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "已归档文件的标签:%s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "正在å¸è½½ CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "正在盘片中查找索引文件..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3126,7 +3117,7 @@ msgstr ""
"找到了 %zu 个软件包索引ã€%zu 个æºä»£ç åŒ…索引ã€%zu 个翻译索引和 %zu 个数字签"
"å\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
@@ -3134,16 +3125,16 @@ msgstr ""
"无法确定任何包文件的ä½ç½®ï¼Œå¯èƒ½è¿™ä¸æ˜¯ä¸€å¼  Debian 盘片或者是选择了错误的硬件构"
"架。"
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "找到标签 '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "è¿™ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„å字,请é‡è¯•ã€‚\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3152,15 +3143,15 @@ msgstr ""
"这张盘片现在的å字是:\n"
"“%sâ€\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "正在å¤åˆ¶è½¯ä»¶åŒ…列表……"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "正在写入新的æºåˆ—表\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件æºè®¾ç½®é¡¹æ˜¯ï¼š\n"
@@ -3444,6 +3435,13 @@ msgid "Not locked"
msgstr "未é”定"
#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "现把 %s 作为了 CD-ROM 的挂载点\n"
+#~ "正在挂载 CD-ROM\n"
+
+#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr "æ— æ³•è¿žåŒ mmap 和文件æ“作用途为 %s æ‰“è¡¥ä¸ - è¡¥ä¸å¯èƒ½å·²æŸå。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 123cef942..09bdf0760 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: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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."
@@ -157,7 +157,7 @@ msgstr " 套件鎖定:"
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 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
@@ -255,12 +255,12 @@ msgstr "請替這張光碟å–個å字,åƒæ˜¯ 'Debian 2.1r1 Disk 1'"
msgid "Please insert a Disc in the drive and press enter"
msgstr "請把光碟放入光碟機,然後按下 [Enter] éµ"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "無法將 %s æ›´å為 %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "è«‹å°æ‚¨çš„光碟組中的其它光碟é‡è¤‡ç›¸åŒçš„æ“作。"
@@ -728,12 +728,12 @@ msgstr "找ä¸åˆ°ç£ç¢Ÿã€‚"
msgid "File not found"
msgstr "找ä¸åˆ°æª”案"
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "無法å–得狀態"
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "無法設定修改時間"
@@ -992,7 +992,7 @@ msgid ""
"available:\n"
msgstr "由於無法å–得它們的公鑰,以下簽章無法進行驗證:\n"
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
msgid "Empty files can't be valid archives"
msgstr ""
@@ -1303,108 +1303,108 @@ msgstr "是å¦ä¸ç¶“驗證就安è£é€™äº›å¥—件?"
msgid "Failed to fetch %s %s\n"
msgstr "無法å–å¾— %s,%s\n"
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
#: apt-private/private-show.cc:86
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr "ã€å·²å®‰è£ã€‘"
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr "ã€å·²å®‰è£ã€‘"
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr "ã€å·²å®‰è£ã€‘"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr "ã€å·²å®‰è£ã€‘"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "下列的套件有未滿足的相ä¾é—œä¿‚:"
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "但 %s å»å·²å®‰è£"
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "但 %s å»å°‡è¢«å®‰è£"
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "但它å»ç„¡æ³•å®‰è£"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "但它是虛擬套件"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "但它å»å°šæœªå®‰è£"
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "但它å»å°‡ä¸æœƒè¢«å®‰è£"
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
msgid " or"
msgstr "或"
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "下列ã€æ–°ã€‘套件將會被安è£ï¼š"
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "下列套件將會被ã€ç§»é™¤ã€‘:"
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
msgid "The following packages have been kept back:"
msgstr "下列套件將會維æŒå…¶åŽŸæœ‰ç‰ˆæœ¬ï¼š"
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
msgid "The following packages will be upgraded:"
msgstr "下列套件將會被å‡ç´šï¼š"
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
msgid "The following packages will be DOWNGRADED:"
msgstr "下列套件將會被ã€é™ç´šã€‘:"
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "下列被ä¿ç•™ (hold) 的套件將會被更改:"
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s(因為 %s)"
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -1412,27 +1412,27 @@ msgstr ""
"ã€è­¦å‘Šã€‘:下列的基本套件都將被移除。\n"
"除éžæ‚¨å¾ˆæ¸…楚您在åšä»€éº¼ï¼Œå¦å‰‡è«‹å‹¿è¼•æ˜“嘗試ï¼"
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "å‡ç´š %lu å€‹ï¼Œæ–°å®‰è£ %lu 個,"
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "é‡æ–°å®‰è£ %lu 個,"
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "é™ç´š %lu 個,"
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "移除 %lu 個,有 %lu 個未被å‡ç´šã€‚\n"
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu 個沒有完整得安è£æˆ–移除。\n"
@@ -1441,7 +1441,7 @@ msgstr "%lu 個沒有完整得安è£æˆ–移除。\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
msgstr ""
@@ -1449,21 +1449,21 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:699
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr ""
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正è¦è¡¨ç¤ºå¼æ™‚發生錯誤 - %s"
@@ -1631,7 +1631,7 @@ msgstr "無法開啟檔案 %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "無法和å­ç¨‹åºå»ºç«‹ IPC 管線"
@@ -1982,47 +1982,47 @@ msgstr "é‡æ–°å®šç¾©æª” %s 第 %lu 行的格å¼éŒ¯èª¤ #2"
msgid "Malformed override %s line %llu #3"
msgstr "é‡æ–°å®šç¾©æª” %s 第 %lu 行的格å¼éŒ¯èª¤ #3"
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "未知的壓縮演算法 '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "è¦å£“縮輸出 %s 需æ­é…壓縮動作"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "無法建立 FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "fork 時失敗"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
msgid "Compress child"
msgstr "壓縮å­ç¨‹åº"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, c-format
msgid "Internal error, failed to create %s"
msgstr "內部錯誤,無法建立 %s"
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "å’Œå­ç¨‹åº/檔案 IO 失敗"
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "在計算 MD5 時無法讀å–到資料"
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "在å–消 %s 的連çµæ™‚發生å•é¡Œ"
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "無法將 %s æ›´å為 %s"
@@ -2156,12 +2156,12 @@ msgstr "é‡è¤‡åŠ å…¥æŠ½æ›è³‡è¨Š %s -> %s"
msgid "Duplicate conf file %s/%s"
msgstr "é‡è¤‡çš„設定檔 %s/%s"
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
#, c-format
msgid "Failed to write file %s"
msgstr "寫入檔案 %s 失敗"
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "關閉檔案 %s 失敗"
@@ -2540,22 +2540,22 @@ msgstr "讀å–,ä»æœ‰ %lu 未讀但已無空間"
msgid "write, still have %llu to write but couldn't"
msgstr "寫入,ä»æœ‰ %lu 待寫入但已沒辨法"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "在關閉檔案時發生å•é¡Œ"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "在åŒæ­¥æª”案時發生å•é¡Œ"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "在刪除檔案時發生å•é¡Œ"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "在åŒæ­¥æª”案時發生å•é¡Œ"
@@ -2808,7 +2808,7 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr "無法修正å•é¡Œï¼Œæ‚¨ä¿ç•™ (hold) 了æ毀的套件。"
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "找ä¸åˆ°æ¸…單目錄 %spartial。"
@@ -2977,35 +2977,35 @@ msgstr "大å°ä¸ç¬¦"
msgid "Invalid file format"
msgstr "無效的æ“作 %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr "無法å–得以下的密鑰 ID 的公鑰:\n"
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "發行版本è¡çªï¼š%s(應當是 %s 但å»å¾—到 %s)"
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -3013,12 +3013,12 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3027,12 +3027,12 @@ msgstr ""
"找ä¸åˆ° %s 套件的æŸå€‹æª”案。這æ„味著您å¯èƒ½è¦æ‰‹å‹•ä¿®å¾©é€™å€‹å¥—件。(因為找ä¸åˆ°å¹³"
"å°ï¼‰"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -3068,72 +3068,63 @@ msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
msgid "Vendor block %s contains no fingerprint"
msgstr "æ供者å€å¡Š %s 沒有包å«æŒ‡ç´‹ç¢¼"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"使用光碟機掛載點 %s\n"
-"正在掛載光碟機\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "正在識別.."
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "ä¿å­˜æ¨™ç±¤ï¼š%s\n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "正在å¸è¼‰å…‰ç¢Ÿæ©Ÿ...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr "使用光碟機掛載點 %s\n"
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr "正在å¸è¼‰å…‰ç¢Ÿæ©Ÿ\n"
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
msgid "Waiting for disc...\n"
msgstr "正在等待碟片...\n"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr "正在掛載光碟機... \n"
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "正在識別.."
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "ä¿å­˜æ¨™ç±¤ï¼š%s\n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "正在å¸è¼‰å…‰ç¢Ÿæ©Ÿ...\n"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr "正在掃æ碟片中的索引檔..\n"
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr "找到了 %zu 個套件索引,%zu 個原始碼索引,%zu å€‹ç¿»è­¯ç´¢å¼•åŠ %zu 個簽章\n"
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr "找到標籤 '%s'\n"
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr "這並ä¸æ˜¯æ­£ç¢ºçš„å稱,請é‡è©¦ã€‚\n"
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
@@ -3142,15 +3133,15 @@ msgstr ""
"這個碟片å為:\n"
"'%s'\n"
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
msgid "Copying package lists..."
msgstr "正在複製套件清單..."
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
msgid "Writing new source list\n"
msgstr "正在寫入新的來æºåˆ—表\n"
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr "該碟片的來æºåˆ—表項目為:\n"
@@ -3431,6 +3422,13 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "使用光碟機掛載點 %s\n"
+#~ "正在掛載光碟機\n"
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "注æ„,根據正è¦è¡¨ç¤ºå¼ '%2$s' 而é¸æ“‡äº† %1$s\n"
diff --git a/test/integration/test-apt-cli-upgrade b/test/integration/test-apt-cli-upgrade
index 163a55576..21ce69413 100755
--- a/test/integration/test-apt-cli-upgrade
+++ b/test/integration/test-apt-cli-upgrade
@@ -16,8 +16,7 @@ setupaptarchive
APTARCHIVE=$(readlink -f ./aptarchive)
# default is to allow new dependencies
-testequal "Calculating upgrade... Done
-The following NEW packages will be installed:
+testequal "The following NEW packages will be installed:
foo-new-dependency
The following packages will be upgraded:
foo
@@ -28,7 +27,6 @@ Conf foo-new-dependency (2.0 unstable [all])
Conf foo (2.0 unstable [all])" apt upgrade -qq -s
# ensure
-testequal "Calculating upgrade... Done
-The following packages have been kept back:
+testequal "The following packages have been kept back:
foo
0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs
diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove
index 68ea1c574..acde4b096 100755
--- a/test/integration/test-apt-get-autoremove
+++ b/test/integration/test-apt-get-autoremove
@@ -42,12 +42,12 @@ testsuccess aptget autoremove -y
testdpkgnotinstalled 'po-debconf'
testmarkedauto
-sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d'
-testfileequal 'rootdir/var/log/apt/history.log' '
-Install: unrelated:i386 (1), debhelper:i386 (8.0.0), po-debconf:i386 (1.0.16, automatic)
-
+sed rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e 's#), #)\nInstall: #g' | sort -u > apt-history.log
+testfileequal 'apt-history.log' '
+Install: debhelper:i386 (8.0.0)
+Install: po-debconf:i386 (1.0.16, automatic)
+Install: unrelated:i386 (1)
Remove: debhelper:i386 (8.0.0)
-
Remove: po-debconf:i386 (1.0.16)'
testsuccess aptget install debhelper -y
diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download
index c2a5c3d8e..be3144e1f 100755
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@ -34,8 +34,14 @@ testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) SHA512:$(sh
# deb:677887
testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms
-# deb:736962 - apt-get download foo &&
-aptget download apt
-aptget download apt
+# deb:736962
+testsuccess aptget download apt
+testsuccess aptget download apt
testsuccess test -s apt_2.0_all.deb
-rm -f apt_1.0_all.deb
+
+rm -f apt_1.0_all.deb apt_2.0_all.deb
+
+# deb:738103
+testsuccess aptget download apt apt apt/unstable apt=2.0
+testsuccess test -s apt_2.0_all.deb
+
diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing
index 2741509a7..a43354871 100755
--- a/test/integration/test-architecture-specification-parsing
+++ b/test/integration/test-architecture-specification-parsing
@@ -4,102 +4,106 @@ set -e
TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture 'amd64' 'armel'
-buildsimplenativepackage 'pkg-arch-foo' 'amd64' '1.0' 'stable' 'Build-Depends: foo [amd64 !amd64]
-Depends: foo [amd64 !amd64]'
-buildsimplenativepackage 'pkg-arch-no-foo' 'amd64' '1.0' 'stable' 'Build-Depends: foo [!amd64 amd64]
-Depends: foo [!amd64 amd64]'
-buildsimplenativepackage 'pkg-arch-foo-unrelated-no' 'amd64' '1.0' 'stable' 'Build-Depends: foo [!kfreebsd-any amd64]
-Depends: foo [!kfreebsd-any amd64]'
-buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' 'amd64' '1.0' 'stable' 'Build-Depends: foo [amd64 !kfreebsd-any]
-Depends: foo [amd64 !kfreebsd-any]'
-buildsimplenativepackage 'no-depends' 'armel' '1.0' 'stable' 'Build-Depends: foo [armhf], bar [arm]
-Depends: foo [armhf], bar [arm]'
+# we need this construct here as it isn't really possible to fake native arch for dpkg-* tools
+NATIVE="$(command dpkg --print-architecture)"
+configarchitecture "${NATIVE}" 'armel'
+
+buildsimplenativepackage 'pkg-arch-foo' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !${NATIVE}]
+Depends: foo [${NATIVE} !${NATIVE}]"
+buildsimplenativepackage 'pkg-arch-no-foo' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!${NATIVE} ${NATIVE}]
+Depends: foo [!${NATIVE} ${NATIVE}]"
+buildsimplenativepackage 'pkg-arch-foo-unrelated-no' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [!kfreebsd-any ${NATIVE}]
+Depends: foo [!kfreebsd-any ${NATIVE}]"
+buildsimplenativepackage 'pkg-arch-foo-unrelated-no2' "$NATIVE" '1.0' 'stable' "Build-Depends: foo [${NATIVE} !kfreebsd-any]
+Depends: foo [${NATIVE} !kfreebsd-any]"
+buildsimplenativepackage 'no-depends' 'armel' '1.0' 'stable' 'Build-Depends: foo [armeb], bar [arm]
+Depends: foo [armeb], bar [arm]'
-buildsimplenativepackage 'foo' 'amd64' '1.0' 'stable'
+buildsimplenativepackage 'foo' "$NATIVE" '1.0' 'stable'
insertinstalledpackage 'build-essential' 'all' '11.5' 'Multi-Arch: foreign'
setupaptarchive
-testequal 'Reading package lists...
+testequal "Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
The following NEW packages will be installed:
foo pkg-arch-foo
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Inst foo (1.0 stable [amd64])
-Inst pkg-arch-foo (1.0 stable [amd64])
-Conf foo (1.0 stable [amd64])
-Conf pkg-arch-foo (1.0 stable [amd64])' aptget install pkg-arch-foo -s
+Inst foo (1.0 stable [${NATIVE}])
+Inst pkg-arch-foo (1.0 stable [${NATIVE}])
+Conf foo (1.0 stable [${NATIVE}])
+Conf pkg-arch-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo -s
-testequal 'Reading package lists...
+testequal "Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
pkg-arch-no-foo
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Inst pkg-arch-no-foo (1.0 stable [amd64])
-Conf pkg-arch-no-foo (1.0 stable [amd64])' aptget install pkg-arch-no-foo -s
+Inst pkg-arch-no-foo (1.0 stable [${NATIVE}])
+Conf pkg-arch-no-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-no-foo -s
-testequal 'Reading package lists...
+testequal "Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
The following NEW packages will be installed:
foo pkg-arch-foo-unrelated-no
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Inst foo (1.0 stable [amd64])
-Inst pkg-arch-foo-unrelated-no (1.0 stable [amd64])
-Conf foo (1.0 stable [amd64])
-Conf pkg-arch-foo-unrelated-no (1.0 stable [amd64])' aptget install pkg-arch-foo-unrelated-no -s
+Inst foo (1.0 stable [${NATIVE}])
+Inst pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])
+Conf foo (1.0 stable [${NATIVE}])
+Conf pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no -s
-testequal 'Reading package lists...
+testequal "Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
The following NEW packages will be installed:
foo pkg-arch-foo-unrelated-no2
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Inst foo (1.0 stable [amd64])
-Inst pkg-arch-foo-unrelated-no2 (1.0 stable [amd64])
-Conf foo (1.0 stable [amd64])
-Conf pkg-arch-foo-unrelated-no2 (1.0 stable [amd64])' aptget install pkg-arch-foo-unrelated-no2 -s
+Inst foo (1.0 stable [${NATIVE}])
+Inst pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])
+Conf foo (1.0 stable [${NATIVE}])
+Conf pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no2 -s
-testequal 'Reading package lists...
+testequal "Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Inst foo (1.0 stable [amd64])
-Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo -s
+Inst foo (1.0 stable [${NATIVE}])
+Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo -s
testequal 'Reading package lists...
Building dependency tree...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s
-testequal 'Reading package lists...
+testequal "Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Inst foo (1.0 stable [amd64])
-Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo-unrelated-no -s
+Inst foo (1.0 stable [${NATIVE}])
+Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no -s
-testequal 'Reading package lists...
+testequal "Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Inst foo (1.0 stable [amd64])
-Conf foo (1.0 stable [amd64])' aptget build-dep pkg-arch-foo-unrelated-no2 -s
+Inst foo (1.0 stable [${NATIVE}])
+Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no2 -s
testequal 'Reading package lists...
Building dependency tree...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s
# this is not really testing APT - more that dpkg is in line with us
+configarchitecture 'amd64' 'armel'
testequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index ad31511b9..afe1ad443 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -31,6 +31,16 @@ wasmergeused() {
msgfail
fi
+ msgtest 'No intermediate patch files' 'still exist'
+ local EDS="$(find rootdir/var/lib/apt/lists -name '*.ed' -o -name '*.ed.*')"
+ if [ -z "$EDS" ]; then
+ msgpass
+ else
+ echo
+ echo "$EDS"
+ msgfail
+ fi
+
msgtest 'Check if the right pdiff merger was used'
if grep -q '^pkgAcqIndexMergeDiffs::Done(): rred' $OUTPUT; then
if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then
@@ -46,7 +56,7 @@ wasmergeused() {
}
testrun() {
- # setup the base
+ msgmsg "Testcase: setup the base with: $*"
find aptarchive -name 'Packages*' -type f -delete
cp ${PKGFILE} aptarchive/Packages
compressfile 'aptarchive/Packages'
@@ -59,7 +69,7 @@ testrun() {
testequal "$(cat ${PKGFILE})
" aptcache show apt oldstuff
- msgmsg 'Testcase: apply with one patch'
+ msgmsg "Testcase: apply with one patch: $*"
cp ${PKGFILE}-new aptarchive/Packages
compressfile 'aptarchive/Packages'
mkdir -p aptarchive/Packages.diff
@@ -82,13 +92,13 @@ SHA1-Patches:
testequal "$(cat ${PKGFILE}-new)
" aptcache show apt newstuff
- msgmsg 'Testcase: index is already up-to-date'
+ msgmsg "Testcase: index is already up-to-date: $*"
find rootdir/var/lib/apt/lists -name '*.IndexDiff' -type f -delete
testsuccess aptget update "$@"
testequal "$(cat ${PKGFILE}-new)
" aptcache show apt newstuff
- msgmsg 'Testcase: apply with two patches'
+ msgmsg "Testcase: apply with two patches: $*"
cp ${PKGFILE}-new aptarchive/Packages
echo '
Package: futurestuff
@@ -129,7 +139,7 @@ SHA1-Patches:
testequal "$(cat Packages-future)
" aptcache show apt newstuff futurestuff
- msgmsg 'Testcase: patch applying fails, but successful fallback'
+ msgmsg "Testcase: patch applying fails, but successful fallback: $*"
rm -rf rootdir/var/lib/apt/lists
cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists
cp ${PKGFILE}-new aptarchive/Packages
@@ -154,6 +164,10 @@ SHA1-Patches:
testequal "$(cat ${PKGFILE}-new)
" aptcache show apt newstuff
}
+echo 'Debug::pkgAcquire::Diffs "true";
+Debug::pkgAcquire::rred "true";' > rootdir/etc/apt/apt.conf.d/rreddebug.conf
-testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=0
-testrun -o Debug::pkgAcquire::Diffs=1 -o Debug::pkgAcquire::rred=1 -o Acquire::PDiffs::Merge=1
+testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1
+testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1
+testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=0
+testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=0
diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
index 7f3b05e59..5856cd744 100755
--- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
+++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages
@@ -15,19 +15,18 @@ Breaks: libreoffice-core (>= 3+), libreoffice-core (<= 3~), libreoffice-style-ga
insertinstalledpackage 'libreoffice-style-galaxy' 'amd64' '3' 'Depends: libreoffice-core
Provides: libreoffice-style'
-buildsimplenativepackage 'libreoffice' 'amd64' '4' 'sid' 'Depends: libreoffice-core (= 4)'
-buildsimplenativepackage 'libreoffice-core' 'amd64' '4' 'sid' 'Depends: libreoffice-common (>= 4)
+insertpackage 'sid' 'libreoffice' 'amd64' '4' 'Depends: libreoffice-core (= 4)'
+insertpackage 'sid' 'libreoffice-core' 'amd64' '4' 'Depends: libreoffice-common (>= 4)
Breaks: libreoffice-common (<< 4), libreoffice-style-galaxy (<< 4)'
-buildsimplenativepackage 'libreoffice-common' 'all' '4' 'sid' 'Depends: libreoffice-style, ure
+insertpackage 'sid' 'libreoffice-common' 'all' '4' 'Depends: libreoffice-style, ure
Breaks: libreoffice-core (>= 4+), libreoffice-core (<= 4~), libreoffice-style-galaxy (>= 4+), libreoffice-style-galaxy (<= 4~)'
-buildsimplenativepackage 'libreoffice-style-galaxy' 'amd64' '4' 'sid' 'Depends: libreoffice-core
+insertpackage 'sid' 'libreoffice-style-galaxy' 'amd64' '4' 'Depends: libreoffice-core
Provides: libreoffice-style'
-
-buildsimplenativepackage 'ure' 'amd64' '4' 'sid'
+insertpackage 'sid' 'ure' 'amd64' '4'
setupaptarchive
-testequal 'Reading package lists...
+testequalor2 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
ure
@@ -43,4 +42,20 @@ Conf ure (4 sid [amd64])
Conf libreoffice-style-galaxy (4 sid [amd64])
Conf libreoffice-common (4 sid [all])
Conf libreoffice-core (4 sid [amd64])
+Conf libreoffice (4 sid [amd64])' 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ ure
+The following packages will be upgraded:
+ libreoffice libreoffice-common libreoffice-core libreoffice-style-galaxy
+4 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst libreoffice [3] (4 sid [amd64]) []
+Inst libreoffice-style-galaxy [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-common:amd64 ]
+Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffice-core:amd64] [libreoffice-common:amd64 on libreoffice-style-galaxy:amd64] [libreoffice-core:amd64 on libreoffice-common:amd64] [libreoffice-common:amd64 ]
+Inst libreoffice-common [3] (4 sid [all]) []
+Inst ure (4 sid [amd64])
+Conf ure (4 sid [amd64])
+Conf libreoffice-style-galaxy (4 sid [amd64])
+Conf libreoffice-common (4 sid [all])
+Conf libreoffice-core (4 sid [amd64])
Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s